Ticket #6999: anymove.patch

boost/any.hpp

@@ -19 +19 @@
 #include <boost/throw_exception.hpp>
 #include <boost/static_assert.hpp>
 
+#include <boost/move/move.hpp>
+
 // See boost/python/type_id.hpp
 // TODO: add BOOST_TYPEID_COMPARE_BY_NAME to config.hpp
 # if (defined(__GNUC__) && __GNUC__ >= 3) \
@@ -34 +36 @@
 {
     class any
     {
+        BOOST_COPYABLE_AND_MOVABLE_ALT(any)
     public: // structors
 
         any()
@@ -47 +50 @@
         {
         }
 
+        template<typename ValueType>
+        any(BOOST_RV_REF(ValueType) value,typename BOOST_MOVE_MPL_NS::disable_if<BOOST_MOVE_MPL_NS::is_lvalue_reference<ValueType> >::type* = 0)
+          : content(new holder<typename remove_reference<ValueType>::type >(boost::move(value)))
+        {
+        }
+
         any(const any & other)
           : content(other.content ? other.content->clone() : 0)
         {
         }
 
+        any(BOOST_RV_REF(any) other)
+          : content(other.content)
+        {
+            other.content = 0;
+        }
+
         ~any()
         {
             delete content;
@@ -72 +87 @@
             return *this;
         }
 
+        template<typename ValueType>
+        typename BOOST_MOVE_MPL_NS::disable_if<BOOST_MOVE_MPL_NS::is_lvalue_reference<ValueType>,any >::type& operator=(BOOST_RV_REF(ValueType) rhs)
+        {
+            any(boost::move(rhs)).swap(*this);
+            return *this;
+        }
+
         any & operator=(any rhs)
         {
             rhs.swap(*this);
             return *this;
         }
 
+        any & operator=(BOOST_RV_REF(any) rhs)
+        {
+            rhs.swap(*this);
+            return *this;
+        }
+
     public: // queries
 
         bool empty() const
@@ -119 +147 @@
 
             holder(const ValueType & value)
               : held(value)
+            {
+            }
+
+            holder(BOOST_RV_REF(ValueType) value)
+              : held(boost::move(value))
             {
             }