[Boost-commit] svn:boost r71619 - sandbox/block_ptr/boost

Subject: [Boost-commit] svn:boost r71619 - sandbox/block_ptr/boost
From: phil_at_[hidden]
Date: 2011-04-30 03:30:20

Author: pbouchard
Date: 2011-04-30 03:30:20 EDT (Sat, 30 Apr 2011)
New Revision: 71619
URL: http://svn.boost.org/trac/boost/changeset/71619

Log:
* Move fix
Text files modified: 
   sandbox/block_ptr/boost/block_ptr.hpp |    14 +++++---------                          
   1 files changed, 5 insertions(+), 9 deletions(-)

Modified: sandbox/block_ptr/boost/block_ptr.hpp
==============================================================================
--- sandbox/block_ptr/boost/block_ptr.hpp	(original)
+++ sandbox/block_ptr/boost/block_ptr.hpp	2011-04-30 03:30:20 EDT (Sat, 30 Apr 2011)
@@ -391,21 +391,17 @@
                                 release(true);
         }
 
-#if defined(BOOST_HAS_RVALUE_REFS)
-    	block_ptr(block_ptr && p)
+//#if defined(BOOST_HAS_RVALUE_REFS)
+    	block_ptr(block_ptr<T> && p): base(std::move(p.po_)), ps_(std::move(p.ps_))
             {
-        	po_ = std::move(p.po_);
-        	ps_ = std::move(p.ps_);
             }
 
             template<class Y>
-    		block_ptr(block_ptr<Y> && p): base(0), ps_(0)
+    		block_ptr(block_ptr<Y> && p): base(std::move(p.po_)), ps_(std::move(p.ps_))
                     {
-	        	po_ = std::move(p.po_);
-	        	ps_ = std::move(p.ps_);
                     }
 
-    	block_ptr & operator = (block_ptr && p)
+    	block_ptr<T> & operator = (block_ptr<T> && p)
             {
                 po_ = std::move(p.po_);
                 ps_ = std::move(p.ps_);
@@ -421,7 +417,7 @@
                         
                         return *this;
                     }
-#endif
+//#endif
 
     private:
                 /**