feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Fix move constructors with unequal allocators and move/copy assignment of tree.

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-02-26 00:22:23 +01:00
parent d0750f4493
commit c2ea5da716
8 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/container/stable_vector.hpp
+3 -2
View File
@@ -728,11 +728,12 @@ class stable_vector
: internal_data(a), index(a)
{
if(this->priv_node_alloc() == x.priv_node_alloc()){
this->index.swap(x.index);
this->priv_swap_members(x);
}
else{
stable_vector_detail::clear_on_destroy<stable_vector> cod(*this);
this->insert(this->cend(), x.begin(), x.end());
this->insert(this->cend(), boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
STABLE_VECTOR_CHECK_INVARIANT;
cod.release();
}
@@ -808,7 +809,7 @@ class stable_vector
//Move allocator if needed
container_detail::move_alloc(this_alloc, x_alloc, flag);
//Take resources
this->index = boost::move(x.index);
this->index.swap(x.index);
this->priv_swap_members(x);
}
//Else do a one by one move