feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Make null unique_ptr convert to empty shared_ptr

Browse Source
This commit is contained in:
Peter Dimov
2017-06-13 05:50:40 +03:00
parent 52d976fde2
commit 1d314c5668
3 changed files with 130 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/shared_ptr.hpp
+16 -7
View File
@@ -502,9 +502,12 @@ public:
boost::detail::sp_assert_convertible< Y, T >();
typename std::unique_ptr< Y, D >::pointer tmp = r.get();
pn = boost::detail::shared_count( r );
boost::detail::sp_deleter_construct( this, tmp );
if( tmp != 0 )
{
pn = boost::detail::shared_count( r );
boost::detail::sp_deleter_construct( this, tmp );
}
}
#endif
@@ -515,9 +518,12 @@ public:
boost::detail::sp_assert_convertible< Y, T >();
typename boost::movelib::unique_ptr< Y, D >::pointer tmp = r.get();
pn = boost::detail::shared_count( r );
boost::detail::sp_deleter_construct( this, tmp );
if( tmp != 0 )
{
pn = boost::detail::shared_count( r );
boost::detail::sp_deleter_construct( this, tmp );
}
}
// assignment
@@ -592,10 +598,13 @@ public:
shared_ptr tmp;
tmp.px = p;
tmp.pn = boost::detail::shared_count( r );
if( p != 0 )
{
tmp.px = p;
tmp.pn = boost::detail::shared_count( r );
boost::detail::sp_deleter_construct( &tmp, p );
boost::detail::sp_deleter_construct( &tmp, p );
}
tmp.swap( *this );