boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 06:24:26 +02:00
Code Issues Packages Projects Releases Wiki 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

3
include/boost/container/deque.hpp
View File

@@ -718,7 +718,8 @@ class deque : protected deque_base<Allocator>
if(x.size()){ if(x.size()){
this->priv_initialize_map(x.size()); this->priv_initialize_map(x.size());
boost::container::uninitialized_copy_alloc boost::container::uninitialized_copy_alloc
(this->alloc(), x.begin(), x.end(), this->members_.m_start); ( this->alloc(), boost::make_move_iterator(x.begin())
, boost::make_move_iterator(x.end()), this->members_.m_start);
} }
} }
} }

14
include/boost/container/detail/node_alloc_holder.hpp
View File

@@ -370,7 +370,7 @@ struct node_alloc_holder
protected: protected:
struct cloner struct cloner
{ {
cloner(node_alloc_holder &holder) explicit cloner(node_alloc_holder &holder)
: m_holder(holder) : m_holder(holder)
{} {}
@@ -380,6 +380,18 @@ struct node_alloc_holder
node_alloc_holder &m_holder; node_alloc_holder &m_holder;
}; };
struct move_cloner
{
move_cloner(node_alloc_holder &holder)
: m_holder(holder)
{}
NodePtr operator()(Node &other)
{ return m_holder.create_node(::boost::move(other.get_data())); }
node_alloc_holder &m_holder;
};
struct members_holder struct members_holder
: public NodeAlloc : public NodeAlloc
{ {

6
include/boost/container/detail/tree.hpp
View File

@@ -400,10 +400,10 @@ class RecyclingCloner
{} {}
static void do_assign(node_ptr_type &p, const node_type &other, bool_<true>) static void do_assign(node_ptr_type &p, const node_type &other, bool_<true>)
{ p->do_assign(other.m_data); } { p->do_move_assign(const_cast<node_type &>(other).m_data); }
static void do_assign(node_ptr_type &p, const node_type &other, bool_<false>) static void do_assign(node_ptr_type &p, const node_type &other, bool_<false>)
{ p->do_move_assign(const_cast<node_type &>(other).m_data); } { p->do_assign(other.m_data); }
node_ptr_type operator()(const node_type &other) const node_ptr_type operator()(const node_type &other) const
{ {
@@ -663,7 +663,7 @@ class tree
} }
else{ else{
this->icont().clone_from this->icont().clone_from
(x.icont(), typename AllocHolder::cloner(*this), Destroyer(this->node_alloc())); (x.icont(), typename AllocHolder::move_cloner(*this), Destroyer(this->node_alloc()));
} }
} }

2
include/boost/container/list.hpp
View File

@@ -278,7 +278,7 @@ class list
this->icont().swap(x.icont()); this->icont().swap(x.icont());
} }
else{ else{
this->insert(this->cbegin(), x.begin(), x.end()); this->insert(this->cbegin(), boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
} }
} }

2
include/boost/container/map.hpp
View File

@@ -1449,5 +1449,5 @@ namespace container {
#include <boost/container/detail/config_end.hpp> #include <boost/container/detail/config_end.hpp>
#endif /* BOOST_CONTAINER_MAP_HPP */ #endif // BOOST_CONTAINER_MAP_HPP

3
include/boost/container/set.hpp
View File

@@ -1154,5 +1154,4 @@ namespace container {
#include <boost/container/detail/config_end.hpp> #include <boost/container/detail/config_end.hpp>
#endif /* BOOST_CONTAINER_SET_HPP */ #endif // BOOST_CONTAINER_SET_HPP

7
include/boost/container/slist.hpp
View File

@@ -331,7 +331,7 @@ class slist
this->icont().swap(x.icont()); this->icont().swap(x.icont());
} }
else{ else{
this->insert_after(this->cbefore_begin(), x.begin(), x.end()); this->insert_after(this->cbefore_begin(), boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
} }
} }
@@ -1667,11 +1667,6 @@ namespace container {
#define BOOST_CONTAINER_CLANG_INLINE_STD_NS #define BOOST_CONTAINER_CLANG_INLINE_STD_NS
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wc++11-extensions" #pragma GCC diagnostic ignored "-Wc++11-extensions"
#define BOOST_CONTAINER_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
#define BOOST_CONTAINER_STD_NS_END _LIBCPP_END_NAMESPACE_STD
#else
#define BOOST_CONTAINER_STD_NS_BEG namespace std{
#define BOOST_CONTAINER_STD_NS_END }
#endif #endif
BOOST_CONTAINER_STD_NS_BEG BOOST_CONTAINER_STD_NS_BEG

5
include/boost/container/stable_vector.hpp
View File

@@ -728,11 +728,12 @@ class stable_vector
: internal_data(a), index(a) : internal_data(a), index(a)
{ {
if(this->priv_node_alloc() == x.priv_node_alloc()){ if(this->priv_node_alloc() == x.priv_node_alloc()){
this->index.swap(x.index);
this->priv_swap_members(x); this->priv_swap_members(x);
} }
else{ else{
stable_vector_detail::clear_on_destroy<stable_vector> cod(*this); 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; STABLE_VECTOR_CHECK_INVARIANT;
cod.release(); cod.release();
} }
@@ -808,7 +809,7 @@ class stable_vector
//Move allocator if needed //Move allocator if needed
container_detail::move_alloc(this_alloc, x_alloc, flag); container_detail::move_alloc(this_alloc, x_alloc, flag);
//Take resources //Take resources
this->index = boost::move(x.index); this->index.swap(x.index);
this->priv_swap_members(x); this->priv_swap_members(x);
} }
//Else do a one by one move //Else do a one by one move