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

Fixed sp_enable_shared_from_this to not use void cv * since this breaks function types.

Browse Source 
[SVN r24718]
This commit is contained in:
Peter Dimov
2004-08-24 16:27:31 +00:00
parent ef51f6a1de
commit 27be736b8f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/shared_ptr.hpp
View File

@@ -82,12 +82,12 @@ template<> struct shared_ptr_traits<void const volatile>
// enable_shared_from_this support // enable_shared_from_this support
template<class T, class Y> void sp_enable_shared_from_this(boost::enable_shared_from_this<T> const * pe, Y const * px, shared_count const & pn) template<class T, class Y> void sp_enable_shared_from_this( shared_count const & pn, boost::enable_shared_from_this<T> const * pe, Y const * px )
{ {
if(pe != 0) pe->_internal_weak_this._internal_assign(const_cast<Y*>(px), pn); if(pe != 0) pe->_internal_weak_this._internal_assign(const_cast<Y*>(px), pn);
} }
inline void sp_enable_shared_from_this(void const volatile *, void const volatile *, shared_count const &) inline void sp_enable_shared_from_this( shared_count const & /*pn*/, ... )
{ {
} }
@@ -123,7 +123,7 @@ public:
template<class Y> template<class Y>
explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete
{ {
detail::sp_enable_shared_from_this(p, p, pn); detail::sp_enable_shared_from_this( pn, p, p );
} }
// //
@@ -134,7 +134,7 @@ public:
template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d) template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d)
{ {
detail::sp_enable_shared_from_this(p, p, pn); detail::sp_enable_shared_from_this( pn, p, p );
} }
// generated copy constructor, assignment, destructor are fine... // generated copy constructor, assignment, destructor are fine...
@@ -198,7 +198,7 @@ public:
{ {
Y * tmp = r.get(); Y * tmp = r.get();
pn = detail::shared_count(r); pn = detail::shared_count(r);
detail::sp_enable_shared_from_this(tmp, tmp, pn); detail::sp_enable_shared_from_this( pn, tmp, tmp );
} }
#endif #endif