Merge [57957] to release. Fixes #3570.

[SVN r58067]
2009-11-30 20:34:39 +00:00
parent 4f5062004a
commit b0fd8a6b08
3 changed files with 8 additions and 8 deletions
@@ -368,14 +368,14 @@ public:

    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;
    }