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

Enable move-only deleters in the allocator constructor

Browse Source
This commit is contained in:
Peter Dimov
2021-05-11 02:05:28 +03:00
parent 594c7485a5
commit b52d7548b3
3 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/smart_ptr/detail/sp_counted_impl.hpp
View File

@@ -228,7 +228,7 @@ template<class P, class D, class A> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p
private:
P p_; // copy constructor must not throw
D d_; // copy constructor must not throw
D d_; // copy/move constructor must not throw
A a_; // copy constructor must not throw
sp_counted_impl_pda( sp_counted_impl_pda const & );
@@ -240,10 +240,20 @@ public:
// pre: d( p ) must not throw
#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
sp_counted_impl_pda( P p, D & d, A a ): p_( p ), d_( static_cast< D&& >( d ) ), a_( a )
{
}
#else
sp_counted_impl_pda( P p, D & d, A a ): p_( p ), d_( d ), a_( a )
{
}
#endif
sp_counted_impl_pda( P p, A a ): p_( p ), d_( a ), a_( a )
{
}

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

@@ -405,11 +405,22 @@ public:
// As above, but with allocator. A's copy constructor shall not throw.
#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, static_cast< D&& >( d ), a )
{
boost::detail::sp_deleter_construct( this, p );
}
#else
template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, d, a )
{
boost::detail::sp_deleter_construct( this, p );
}
#endif
#if !defined( BOOST_NO_CXX11_NULLPTR )
template<class D, class A> shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, d, a )
@@ -711,6 +722,11 @@ public:
this_type( p, static_cast< D&& >( d ) ).swap( *this );
}
template<class Y, class D, class A> void reset( Y * p, D d, A a )
{
this_type( p, static_cast< D&& >( d ), a ).swap( *this );
}
#else
template<class Y, class D> void reset( Y * p, D d )
@@ -718,13 +734,13 @@ public:
this_type( p, d ).swap( *this );
}
#endif
template<class Y, class D, class A> void reset( Y * p, D d, A a )
{
this_type( p, d, a ).swap( *this );
}
#endif
template<class Y> void reset( shared_ptr<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT
{
this_type( r, p ).swap( *this );

25
test/sp_move_only_deleter.cpp
View File

@@ -100,6 +100,31 @@ int main()
BOOST_TEST( Y::instances == 0 );
}
{
YD del;
boost::shared_ptr<Y> p( new Y, std::move( del ), std::allocator<Y>() );
BOOST_TEST( Y::instances == 1 );
BOOST_TEST( del.moved_ );
p.reset( new Y, YD(), std::allocator<Y>() );
BOOST_TEST( Y::instances == 1 );
p = boost::shared_ptr<Y>( new Y, YD(), std::allocator<Y>() );
BOOST_TEST( Y::instances == 1 );
YD del2;
p.reset( new Y, std::move( del2 ), std::allocator<Y>() );
BOOST_TEST( Y::instances == 1 );
BOOST_TEST( del2.moved_ );
p.reset();
BOOST_TEST( Y::instances == 0 );
}
return boost::report_errors();
}