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

Fix shared_from_raw_test4 failures.

Browse Source
This commit is contained in:
Peter Dimov
2014-08-06 21:28:03 +03:00
parent bd4f9c239a
commit 8de3e84021
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/smart_ptr/enable_shared_from_raw.hpp
View File

@ -4,7 +4,7 @@
//
// enable_shared_from_raw.hpp
//
// Copyright 2002, 2009 Peter Dimov
// Copyright 2002, 2009, 2014 Peter Dimov
// Copyright 2008-2009 Frank Mori Hess
//
// Distributed under the Boost Software License, Version 1.0.
@ -72,16 +72,15 @@ private:
template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe );
#endif
shared_ptr<void> shared_from_this()
shared_ptr<void const volatile> shared_from_this() const
{
init_weak_once();
return shared_ptr<void>( weak_this_ );
return shared_ptr<void const volatile>( weak_this_ );
}
shared_ptr<const void> shared_from_this() const
shared_ptr<void const volatile> shared_from_this() const volatile
{
init_weak_once();
return shared_ptr<const void>( weak_this_ );
return const_cast< enable_shared_from_raw const * >( this )->shared_from_this();
}
// Note: invoked automatically by shared_ptr; do not call
@ -107,9 +106,11 @@ private:
}
}
mutable weak_ptr<void> weak_this_;
mutable weak_ptr<void const volatile> weak_this_;
private:
mutable shared_ptr<void> shared_this_;
mutable shared_ptr<void const volatile> shared_this_;
};
template<typename T>

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

@ -893,7 +893,7 @@ class esft2_deleter_wrapper
{
private:
shared_ptr<void> deleter_;
shared_ptr<void const volatile> deleter_;
public: