forked from boostorg/unordered
Replace boost::move with std::move
This commit is contained in:
@@ -191,10 +191,10 @@ template <class X, class T> void container_test(X& r, T const&)
|
||||
node_type n1;
|
||||
node_type n2(rvalue_default<node_type>());
|
||||
#if !BOOST_COMP_GNUC || BOOST_COMP_GNUC >= BOOST_VERSION_NUMBER(4, 8, 0)
|
||||
TEST_NOEXCEPT_EXPR(node_type(boost::move(n1)));
|
||||
TEST_NOEXCEPT_EXPR(node_type(std::move(n1)));
|
||||
#endif
|
||||
node_type n3;
|
||||
n3 = boost::move(n2);
|
||||
n3 = std::move(n2);
|
||||
n1.swap(n3);
|
||||
swap(n1, n3);
|
||||
// TODO: noexcept for swap?
|
||||
@@ -350,7 +350,7 @@ template <class X, class Key> void unordered_set_test(X& r, Key const&)
|
||||
|
||||
test::minimal::constructor_param v;
|
||||
Key k_lvalue(v);
|
||||
r.emplace(boost::move(k_lvalue));
|
||||
r.emplace(std::move(k_lvalue));
|
||||
node_type n1 = r.extract(r.begin());
|
||||
test::check_return_type<value_type>::equals_ref(n1.value());
|
||||
#endif
|
||||
@@ -493,11 +493,11 @@ void unordered_map_test(X& r, Key const& k, T const& v)
|
||||
test::check_return_type<key_type>::equals_ref(n1.key());
|
||||
test::check_return_type<T>::equals_ref(n1.mapped());
|
||||
|
||||
node_type n2 = boost::move(n1);
|
||||
r.insert(boost::move(n2));
|
||||
node_type n2 = std::move(n1);
|
||||
r.insert(std::move(n2));
|
||||
r.insert(r.extract(r.begin()));
|
||||
n2 = r.extract(r.begin());
|
||||
r.insert(r.begin(), boost::move(n2));
|
||||
r.insert(r.begin(), std::move(n2));
|
||||
r.insert(r.end(), r.extract(r.begin()));
|
||||
|
||||
node_type n = r.extract(r.begin());
|
||||
@@ -530,11 +530,11 @@ template <class X, class T> void unordered_unique_test(X& r, T const& t)
|
||||
|
||||
// TODO;
|
||||
// boost::function_requires<
|
||||
// boost::MoveConstructibleConcept<insert_return_type>
|
||||
// std::moveConstructibleConcept<insert_return_type>
|
||||
// >();
|
||||
// TODO;
|
||||
// boost::function_requires<
|
||||
// boost::MoveAssignableConcept<insert_return_type>
|
||||
// std::moveAssignableConcept<insert_return_type>
|
||||
// >();
|
||||
boost::function_requires<
|
||||
boost::DefaultConstructibleConcept<insert_return_type> >();
|
||||
@@ -881,9 +881,9 @@ void unordered_movable_test(X& x, Key& k, T& /* t */, Hash& hf, Pred& eq)
|
||||
|
||||
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
X x1(rvalue_default<X>());
|
||||
X x2(boost::move(x1));
|
||||
X x2(std::move(x1));
|
||||
x1 = rvalue_default<X>();
|
||||
x2 = boost::move(x1);
|
||||
x2 = std::move(x1);
|
||||
#endif
|
||||
|
||||
X a;
|
||||
@@ -922,19 +922,19 @@ void unordered_movable_test(X& x, Key& k, T& /* t */, Hash& hf, Pred& eq)
|
||||
test::check_return_type<iterator>::equals(a.emplace_hint(q, v));
|
||||
|
||||
T v1(v);
|
||||
a.emplace(boost::move(v1));
|
||||
a.emplace(std::move(v1));
|
||||
T v2(v);
|
||||
a.insert(boost::move(v2));
|
||||
a.insert(std::move(v2));
|
||||
T v3(v);
|
||||
test::check_return_type<iterator>::equals(a.emplace_hint(q, boost::move(v3)));
|
||||
test::check_return_type<iterator>::equals(a.emplace_hint(q, std::move(v3)));
|
||||
T v4(v);
|
||||
test::check_return_type<iterator>::equals(a.insert(q, boost::move(v4)));
|
||||
test::check_return_type<iterator>::equals(a.insert(q, std::move(v4)));
|
||||
|
||||
a.insert(i, j);
|
||||
|
||||
X a10;
|
||||
T v5(v);
|
||||
a10.insert(boost::move(v5));
|
||||
a10.insert(std::move(v5));
|
||||
q = a10.cbegin();
|
||||
#ifdef BOOST_UNORDERED_FOA_TESTS
|
||||
test::check_return_type<iterator>::convertible(a10.erase(q));
|
||||
|
||||
Reference in New Issue
Block a user