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

23
include/boost/smart_ptr/shared_ptr.hpp
View File

@ -502,9 +502,12 @@ public:
boost::detail::sp_assert_convertible< Y, T >(); boost::detail::sp_assert_convertible< Y, T >();
typename std::unique_ptr< Y, D >::pointer tmp = r.get(); 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 #endif
@ -515,9 +518,12 @@ public:
boost::detail::sp_assert_convertible< Y, T >(); boost::detail::sp_assert_convertible< Y, T >();
typename boost::movelib::unique_ptr< Y, D >::pointer tmp = r.get(); 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 // assignment
@ -592,10 +598,13 @@ public:
shared_ptr tmp; shared_ptr tmp;
tmp.px = p; if( p != 0 )
tmp.pn = boost::detail::shared_count( r ); {
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 ); tmp.swap( *this );

59
test/sp_bml_unique_ptr_test.cpp
View File

@ -12,6 +12,7 @@
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_test.hpp>
#include <boost/move/unique_ptr.hpp> #include <boost/move/unique_ptr.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <memory> #include <memory>
#include <utility> #include <utility>
@ -66,11 +67,42 @@ struct YD
{ {
void operator()( Y* p ) const void operator()( Y* p ) const
{ {
p->deleted_ = true; if( p )
delete p; {
p->deleted_ = true;
delete p;
}
else
{
BOOST_ERROR( "YD::operator()(0) called" );
}
} }
}; };
template<class U, class T, class D> static void test_null_unique_ptr( boost::movelib::unique_ptr<T, D> p1, boost::movelib::unique_ptr<T, D> p2 )
{
BOOST_TEST( T::instances == 0 );
boost::shared_ptr<U> sp( boost::move( p1 ) );
BOOST_TEST( sp.get() == 0 );
BOOST_TEST( sp.use_count() == 0 );
sp.reset( new T, typename boost::remove_reference<D>::type() );
BOOST_TEST( sp.get() != 0 );
BOOST_TEST( sp.use_count() == 1 );
BOOST_TEST( T::instances == 1 );
sp = boost::move( p2 );
BOOST_TEST( sp.get() == 0 );
BOOST_TEST( sp.use_count() == 0 );
BOOST_TEST( T::instances == 0 );
}
int main() int main()
{ {
{ {
@ -235,5 +267,28 @@ int main()
BOOST_TEST( Y::instances == 0 ); BOOST_TEST( Y::instances == 0 );
} }
{
test_null_unique_ptr<X>( boost::movelib::unique_ptr<X>(), boost::movelib::unique_ptr<X>() );
test_null_unique_ptr<X const>( boost::movelib::unique_ptr<X>(), boost::movelib::unique_ptr<X>() );
test_null_unique_ptr<void>( boost::movelib::unique_ptr<X>(), boost::movelib::unique_ptr<X>() );
test_null_unique_ptr<void const>( boost::movelib::unique_ptr<X>(), boost::movelib::unique_ptr<X>() );
}
{
test_null_unique_ptr<Y>( boost::movelib::unique_ptr<Y, YD>( 0, YD() ), boost::movelib::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<Y const>( boost::movelib::unique_ptr<Y, YD>( 0, YD() ), boost::movelib::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<void>( boost::movelib::unique_ptr<Y, YD>( 0, YD() ), boost::movelib::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<void const>( boost::movelib::unique_ptr<Y, YD>( 0, YD() ), boost::movelib::unique_ptr<Y, YD>( 0, YD() ) );
}
{
YD yd;
test_null_unique_ptr<Y>( boost::movelib::unique_ptr<Y, YD&>( 0, yd ), boost::movelib::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<Y const>( boost::movelib::unique_ptr<Y, YD&>( 0, yd ), boost::movelib::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<void>( boost::movelib::unique_ptr<Y, YD&>( 0, yd ), boost::movelib::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<void const>( boost::movelib::unique_ptr<Y, YD&>( 0, yd ), boost::movelib::unique_ptr<Y, YD&>( 0, yd ) );
}
return boost::report_errors(); return boost::report_errors();
} }

59
test/sp_unique_ptr_test.cpp
View File

@ -11,6 +11,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_test.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <memory> #include <memory>
#include <utility> #include <utility>
@ -67,11 +68,42 @@ struct YD
{ {
void operator()( Y* p ) const void operator()( Y* p ) const
{ {
p->deleted_ = true; if( p )
delete p; {
p->deleted_ = true;
delete p;
}
else
{
BOOST_ERROR( "YD::operator()(0) called" );
}
} }
}; };
template<class U, class T, class D> static void test_null_unique_ptr( std::unique_ptr<T, D> p1, std::unique_ptr<T, D> p2 )
{
BOOST_TEST( T::instances == 0 );
boost::shared_ptr<U> sp( std::move( p1 ) );
BOOST_TEST( sp.get() == 0 );
BOOST_TEST( sp.use_count() == 0 );
sp.reset( new T, typename boost::remove_reference<D>::type() );
BOOST_TEST( sp.get() != 0 );
BOOST_TEST( sp.use_count() == 1 );
BOOST_TEST( T::instances == 1 );
sp = std::move( p2 );
BOOST_TEST( sp.get() == 0 );
BOOST_TEST( sp.use_count() == 0 );
BOOST_TEST( T::instances == 0 );
}
int main() int main()
{ {
{ {
@ -226,6 +258,29 @@ int main()
BOOST_TEST( Y::instances == 0 ); BOOST_TEST( Y::instances == 0 );
} }
{
test_null_unique_ptr<X>( std::unique_ptr<X>(), std::unique_ptr<X>() );
test_null_unique_ptr<X const>( std::unique_ptr<X>(), std::unique_ptr<X>() );
test_null_unique_ptr<void>( std::unique_ptr<X>(), std::unique_ptr<X>() );
test_null_unique_ptr<void const>( std::unique_ptr<X>(), std::unique_ptr<X>() );
}
{
test_null_unique_ptr<Y>( std::unique_ptr<Y, YD>( 0, YD() ), std::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<Y const>( std::unique_ptr<Y, YD>( 0, YD() ), std::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<void>( std::unique_ptr<Y, YD>( 0, YD() ), std::unique_ptr<Y, YD>( 0, YD() ) );
test_null_unique_ptr<void const>( std::unique_ptr<Y, YD>( 0, YD() ), std::unique_ptr<Y, YD>( 0, YD() ) );
}
{
YD yd;
test_null_unique_ptr<Y>( std::unique_ptr<Y, YD&>( 0, yd ), std::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<Y const>( std::unique_ptr<Y, YD&>( 0, yd ), std::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<void>( std::unique_ptr<Y, YD&>( 0, yd ), std::unique_ptr<Y, YD&>( 0, yd ) );
test_null_unique_ptr<void const>( std::unique_ptr<Y, YD&>( 0, yd ), std::unique_ptr<Y, YD&>( 0, yd ) );
}
return boost::report_errors(); return boost::report_errors();
} }