boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-10-29 06:41:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed enable_shared_from_this2 to enable_shared_from_raw and

Browse Source 
added shared_from_raw free function.  These changes fix the pointer 
value in shared_ptr which were obtained before an external shared_ptr has
taken ownership of the object (for example when a shared_ptr to
this is obtained in an object's constructor).



[SVN r57197]
This commit is contained in:
Frank Mori Hess
2009-10-28 19:10:47 +00:00
parent e824e23ec2
commit 32eb028e13
4 changed files with 171 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/esft_constructor_test.cpp
View File

@@ -13,14 +13,13 @@
// See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
#include <boost/smart_ptr/enable_shared_from_this2.hpp>
#include <boost/smart_ptr/enable_shared_from_raw.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <memory>
class X: public boost::enable_shared_from_this2< X >
class X: public boost::enable_shared_from_raw
{
private:
@@ -42,7 +41,7 @@ public:
explicit X( int expected, boost::shared_ptr<X> *early_px = 0 ): destroyed_( 0 ), deleted_( 0 ), expected_( expected )
{
++instances;
if( early_px ) *early_px = shared_from_this();
if( early_px ) *early_px = shared_from_raw(this);
}
~X()
@@ -75,7 +74,7 @@ bool are_shared_owners(const boost::shared_ptr<T> &a, const boost::shared_ptr<U>
return !(a < b) && !(b < a);
}
struct Y: public boost::enable_shared_from_this2<Y>
struct Y: public boost::enable_shared_from_raw
{};
int main()
@@ -87,6 +86,7 @@ int main()
X* x = new X( 1, &early_px );
BOOST_TEST( early_px.use_count() > 0 );
BOOST_TEST( boost::get_deleter<X::deleter_type>(early_px) == 0 );
BOOST_TEST( early_px.get() == x );
boost::shared_ptr<X> px( x, &X::deleter2 );
BOOST_TEST( early_px.use_count() == 2 && px.use_count() == 2 );
BOOST_TEST(are_shared_owners(early_px, px));
@@ -117,7 +117,7 @@ int main()
{
boost::shared_ptr<X> early_px;
X x( 1, &early_px );
X x( 2, &early_px );
BOOST_TEST( early_px.use_count() > 0 );
boost::shared_ptr<X> px( &x, &X::deleter );
BOOST_TEST( early_px.use_count() == 2 && px.use_count() == 2 );
@@ -125,13 +125,11 @@ int main()
BOOST_TEST( px.use_count() == 1 );
BOOST_TEST( X::instances == 1 );
px.reset();
try
{
x.shared_from_this();
BOOST_ERROR("x did not throw bad_weak_ptr");
}
catch( const boost::bad_weak_ptr & )
{}
// test reinitialization after all shared_ptr have expired
early_px = shared_from_raw(&x);
px.reset( &x, &X::deleter );
BOOST_TEST(are_shared_owners(early_px, px));
early_px.reset();
}
BOOST_TEST( X::instances == 0 );
@@ -157,7 +155,7 @@ int main()
px.reset();
try
{
y.shared_from_this();
shared_from_raw(&y);
}
catch( const boost::bad_weak_ptr & )
{