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

Fixed access to enable_shared_from_raw::weak_this_ when

Browse Source 
BOOST_NO_MEMBER_TEMPLATE_FRIENDS is defined.



[SVN r57518]
This commit is contained in:
Frank Mori Hess
2009-11-09 16:33:35 +00:00
parent 9f49538b37
commit 502de325ee
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,11 +51,6 @@ protected:
BOOST_ASSERT( shared_this_.use_count() <= 1 ); // make sure no dangling shared_ptr objects exist BOOST_ASSERT( shared_this_.use_count() <= 1 ); // make sure no dangling shared_ptr objects exist
} }
private:
mutable weak_ptr<void> weak_this_;
mutable shared_ptr<void> shared_this_;
private: private:
void init_weak_once() const void init_weak_once() const
@@ -111,6 +106,10 @@ private:
shared_this_.reset(); shared_this_.reset();
} }
} }
mutable weak_ptr<void> weak_this_;
private:
mutable shared_ptr<void> shared_this_;
}; };
template<typename T> template<typename T>