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

Fixes #152 ("Tree-based containers have troubles with move-only types")

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-10-31 23:09:52 +01:00
parent 38ea1d7294
commit d4c8bd70ea
4 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/container/detail/tree.hpp
+5 -4
View File
@@ -387,13 +387,14 @@ class RecyclingCloner
: m_holder(holder), m_icont(itree)
{}
BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type &p, const node_t &other, bool_<true>)
{ p->do_move_assign(const_cast<node_t &>(other).get_real_data()); }
BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type &p, node_t &other, bool_<true>)
{ p->do_move_assign(other.get_real_data()); }
BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type &p, const node_t &other, bool_<false>)
{ p->do_assign(other.get_real_data()); }
node_ptr_type operator()(const node_t &other) const
node_ptr_type operator()
(typename dtl::if_c<DoMove, node_t &, const node_t&>::type other) const
{
if(node_ptr_type p = m_icont.unlink_leftmost_without_rebalance()){
//First recycle a node (this can't throw)
@@ -413,7 +414,7 @@ class RecyclingCloner
BOOST_CATCH_END
}
else{
return m_holder.create_node(other.get_real_data());
return m_holder.create_node(boost::move(other.get_real_data()));
}
}