Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r57957 - trunk/boost/smart_ptr
From: pdimov_at_[hidden]
Date: 2009-11-26 16:20:48


Author: pdimov
Date: 2009-11-26 16:20:47 EST (Thu, 26 Nov 2009)
New Revision: 57957
URL: http://svn.boost.org/trac/boost/changeset/57957

Log:
Remove std::move references. Refs #3570.
Text files modified:
   trunk/boost/smart_ptr/intrusive_ptr.hpp | 2 +-
   trunk/boost/smart_ptr/shared_ptr.hpp | 4 ++--
   trunk/boost/smart_ptr/weak_ptr.hpp | 10 +++++-----
   3 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/smart_ptr/intrusive_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/intrusive_ptr.hpp (original)
+++ trunk/boost/smart_ptr/intrusive_ptr.hpp 2009-11-26 16:20:47 EST (Thu, 26 Nov 2009)
@@ -122,7 +122,7 @@
 
     intrusive_ptr & operator=(intrusive_ptr && rhs)
     {
- this_type(std::move(rhs)).swap(*this);
+ this_type( static_cast< intrusive_ptr && >( rhs ) ).swap(*this);
         return *this;
     }
 

Modified: trunk/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/shared_ptr.hpp (original)
+++ trunk/boost/smart_ptr/shared_ptr.hpp 2009-11-26 16:20:47 EST (Thu, 26 Nov 2009)
@@ -362,14 +362,14 @@
 
     shared_ptr & operator=( shared_ptr && r ) // never throws
     {
- this_type( std::move( r ) ).swap( *this );
+ this_type( static_cast< shared_ptr && >( r ) ).swap( *this );
         return *this;
     }
 
     template<class Y>
     shared_ptr & operator=( shared_ptr<Y> && r ) // never throws
     {
- this_type( std::move( r ) ).swap( *this );
+ this_type( static_cast< shared_ptr<Y> && >( r ) ).swap( *this );
         return *this;
     }
 

Modified: trunk/boost/smart_ptr/weak_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/weak_ptr.hpp (original)
+++ trunk/boost/smart_ptr/weak_ptr.hpp 2009-11-26 16:20:47 EST (Thu, 26 Nov 2009)
@@ -86,13 +86,13 @@
     weak_ptr( weak_ptr<Y> && r )
 
 #endif
- : px(r.lock().get()), pn(std::move(r.pn)) // never throws
+ : px( r.lock().get() ), pn( static_cast< boost::detail::weak_count && >( r.pn ) ) // never throws
     {
         r.px = 0;
     }
 
     // for better efficiency in the T == Y case
- weak_ptr( weak_ptr && r ): px( r.px ), pn(std::move(r.pn)) // never throws
+ weak_ptr( weak_ptr && r ): px( r.px ), pn( static_cast< boost::detail::weak_count && >( r.pn ) ) // never throws
     {
         r.px = 0;
     }
@@ -100,7 +100,7 @@
     // for better efficiency in the T == Y case
     weak_ptr & operator=( weak_ptr && r ) // never throws
     {
- this_type( std::move( r ) ).swap( *this );
+ this_type( static_cast< weak_ptr && >( r ) ).swap( *this );
         return *this;
     }
 
@@ -134,9 +134,9 @@
 #if defined( BOOST_HAS_RVALUE_REFS )
 
     template<class Y>
- weak_ptr & operator=(weak_ptr<Y> && r)
+ weak_ptr & operator=( weak_ptr<Y> && r )
     {
- this_type( std::move( r ) ).swap( *this );
+ this_type( static_cast< weak_ptr<Y> && >( r ) ).swap( *this );
         return *this;
     }
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk