Ticket #13405: boost_container_move_fix.diff

boost/container/detail/tree.hpp

@@ -354 +354 @@
    typedef typename AllocHolder::intrusive_container  intrusive_container;
    typedef typename AllocHolder::Node                 node_t;
    typedef typename AllocHolder::NodePtr              node_ptr_type;
+   typedef typename boost::container::container_detail::if_c<
+      DoMove,
+      node_t,
+      const node_t>::type                             node_param_t;
 
    public:
    RecyclingCloner(AllocHolder &holder, intrusive_container &itree)
       :  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).m_data);   }
+   BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type &p, node_t &other, bool_<true>)
+   {  p->do_move_assign(other.m_data);   }
 
    BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type &p, const node_t &other, bool_<false>)
    {  p->do_assign(other.m_data);   }
 
-   node_ptr_type operator()(const node_t &other) const
+   BOOST_CONTAINER_FORCEINLINE static node_ptr_type do_create_node(AllocHolder &holder, node_t &other, bool_<true>)
+   {  return holder.create_node(::boost::move(other.m_data));   }
+
+   BOOST_CONTAINER_FORCEINLINE static node_ptr_type do_create_node(AllocHolder &holder, const node_t &other, bool_<false>)
+   {  return holder.create_node(other.m_data);   }
+
+   node_ptr_type operator()(node_param_t &other) const
    {
       if(node_ptr_type p = m_icont.unlink_leftmost_without_rebalance()){
          //First recycle a node (this can't throw)
@@ -386 +396 @@
          BOOST_CATCH_END
       }
       else{
-         return m_holder.create_node(other.m_data);
+         return this->do_create_node(m_holder, other, bool_<DoMove>());
       }
    }
 

libs/container/test/map_test.cpp

@@ -339 +339 @@
       test_move<map<recursive_map, recursive_map> >();
       test_move<multimap<recursive_multimap, recursive_multimap> >();
    }
+   //Same, but with a move-only content.
+   {
+      test_move<map<test::movable_int, test::movable_int> >();
+      test_move<multimap<test::movable_int, test::movable_int> >();
+   }
 
    //Test std::pair value type as tree has workarounds to make old std::pair
    //implementations movable that can break things

libs/container/test/set_test.cpp

@@ -335 +335 @@
       test_move<set<recursive_set> >();
       test_move<multiset<recursive_multiset> >();
    }
+   //Same, but with a move-only content.
+   {
+      test_move<set<test::movable_int> >();
+      test_move<multiset<test::movable_int> >();
+   }
    //Test std::pair value type as tree has workarounds to make old std::pair
    //implementations movable that can break things
    {