mirror of
https://github.com/boostorg/container.git
synced 2025-08-02 14:04:26 +02:00
Fully qualifified boost move calls
[SVN r77914]
This commit is contained in:
@@ -267,7 +267,7 @@ struct advanced_insert_aux_emplace
|
|||||||
typedef typename base_t::index_tuple_t index_tuple_t;
|
typedef typename base_t::index_tuple_t index_tuple_t;
|
||||||
|
|
||||||
explicit advanced_insert_aux_emplace(A &a, Args&&... args)
|
explicit advanced_insert_aux_emplace(A &a, Args&&... args)
|
||||||
: base_t(a, boost::forward<Args>(args)...)
|
: base_t(a, ::boost::forward<Args>(args)...)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
~advanced_insert_aux_emplace()
|
~advanced_insert_aux_emplace()
|
||||||
@@ -290,7 +290,7 @@ struct advanced_insert_aux_emplace
|
|||||||
alloc_traits::construct(this->a_, vp,
|
alloc_traits::construct(this->a_, vp,
|
||||||
::boost::container::container_detail::stored_ref<Args>::forward(get<IdxPack>(this->args_))...);
|
::boost::container::container_detail::stored_ref<Args>::forward(get<IdxPack>(this->args_))...);
|
||||||
scoped_destructor<A> d(this->a_, vp);
|
scoped_destructor<A> d(this->a_, vp);
|
||||||
*p = boost::move(*vp);
|
*p = ::boost::move(*vp);
|
||||||
d.release();
|
d.release();
|
||||||
this->used_ = true;
|
this->used_ = true;
|
||||||
}
|
}
|
||||||
@@ -307,7 +307,7 @@ struct advanced_insert_aux_emplace
|
|||||||
alloc_traits::construct(this->a_, vp,
|
alloc_traits::construct(this->a_, vp,
|
||||||
::boost::container::container_detail::stored_ref<Args>::forward(get<IdxPack>(this->args_))...);
|
::boost::container::container_detail::stored_ref<Args>::forward(get<IdxPack>(this->args_))...);
|
||||||
try {
|
try {
|
||||||
*p = boost::move(*vp);
|
*p = ::boost::move(*vp);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
alloc_traits::destroy(this->a_, vp);
|
alloc_traits::destroy(this->a_, vp);
|
||||||
throw;
|
throw;
|
||||||
@@ -413,7 +413,7 @@ struct BOOST_PP_CAT(BOOST_PP_CAT(advanced_insert_aux_emplace, n), arg)
|
|||||||
alloc_traits::construct(this->a_, vp \
|
alloc_traits::construct(this->a_, vp \
|
||||||
BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_MEMBER_FORWARD, _)); \
|
BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_MEMBER_FORWARD, _)); \
|
||||||
scoped_destructor<A> d(this->a_, vp); \
|
scoped_destructor<A> d(this->a_, vp); \
|
||||||
*p = boost::move(*vp); \
|
*p = ::boost::move(*vp); \
|
||||||
d.release(); \
|
d.release(); \
|
||||||
this->used_ = true; \
|
this->used_ = true; \
|
||||||
} \
|
} \
|
||||||
@@ -430,7 +430,7 @@ struct BOOST_PP_CAT(BOOST_PP_CAT(advanced_insert_aux_emplace, n), arg)
|
|||||||
alloc_traits::construct(this->a_, vp \
|
alloc_traits::construct(this->a_, vp \
|
||||||
BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_MEMBER_FORWARD, _)); \
|
BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_MEMBER_FORWARD, _)); \
|
||||||
scoped_destructor<A> d(this->a_, vp); \
|
scoped_destructor<A> d(this->a_, vp); \
|
||||||
*p = boost::move(*vp); \
|
*p = ::boost::move(*vp); \
|
||||||
d.release(); \
|
d.release(); \
|
||||||
this->used_ = true; \
|
this->used_ = true; \
|
||||||
} \
|
} \
|
||||||
|
Reference in New Issue
Block a user