boost: update to 1.42.0

[features.git] / boost / boost / smart_ptr / intrusive_ptr.hpp

diff --git a/boost/boost/smart_ptr/intrusive_ptr.hpp b/boost/boost/smart_ptr/intrusive_ptr.hpp
index 6927a591850fac6197616a0342279c1488ccf68c..e72eb2186985d93acbb9387e874895a23bdf1e79 100644 (file)
--- a/boost/boost/smart_ptr/intrusive_ptr.hpp
+++ b/boost/boost/smart_ptr/intrusive_ptr.hpp
@@ -77,7 +77,7 @@ public:
     template<class U>
 #if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
 
-    intrusive_ptr( intrusive_ptr<U> const & rhs, typename detail::sp_enable_if_convertible<U,T>::type = detail::sp_empty() )
+    intrusive_ptr( intrusive_ptr<U> const & rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty() )
 
 #else
 
@@ -122,7 +122,7 @@ public:
 
     intrusive_ptr & operator=(intrusive_ptr && rhs)
     {
-        this_type(std::move(rhs)).swap(*this);
+        this_type( static_cast< intrusive_ptr && >( rhs ) ).swap(*this);
         return *this;
     }