Merge [73202] to release.

[SVN r73542]
This commit is contained in:
Peter Dimov
2011-08-05 08:58:31 +00:00
parent 8abc8889d1
commit d6ac116b71
3 changed files with 47 additions and 3 deletions

View File

@@ -203,7 +203,17 @@ public:
boost::detail::sp_enable_shared_from_this( this, p, p );
}
// generated copy constructor, destructor are fine
// generated copy constructor, destructor are fine...
#if defined( BOOST_HAS_RVALUE_REFS )
// ... except in C++0x, move disables the implicit copy
shared_ptr( shared_ptr const & r ): px( r.px ), pn( r.pn ) // never throws
{
}
#endif
template<class Y>
explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw