boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2026-04-28 18:13:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge [51643] to release. Fixes #2813.

Browse Source 
[SVN r51688]
This commit is contained in:
Peter Dimov
2009-03-10 18:26:57 +00:00
parent 22f1b092c9
commit 31e06b4a1d
6 changed files with 487 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/shared_ptr.hpp
+11 -16
View File
@@ -198,19 +198,7 @@ public:
boost::detail::sp_enable_shared_from_this( this, p, p );
}
// generated copy constructor, assignment, destructor are fine...
// except that Borland C++ has a bug, and g++ with -Wsynth warns
#if defined(__BORLANDC__) || defined(__GNUC__)
shared_ptr & operator=(shared_ptr const & r) // never throws
{
px = r.px;
pn = r.pn; // shared_count::op= doesn't throw
return *this;
}
#endif
// generated copy constructor, destructor are fine
template<class Y>
explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
@@ -301,13 +289,20 @@ public:
#endif // BOOST_NO_AUTO_PTR
#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
// assignment
shared_ptr & operator=( shared_ptr const & r ) // never throws
{
this_type(r).swap(*this);
return *this;
}
#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1400)
template<class Y>
shared_ptr & operator=(shared_ptr<Y> const & r) // never throws
{
px = r.px;
pn = r.pn; // shared_count::op= doesn't throw
this_type(r).swap(*this);
return *this;
}