From 502de325eed53bf8a78883ab007f6fe6e3e910ef Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Mon, 9 Nov 2009 16:33:35 +0000 Subject: [PATCH] Fixed access to enable_shared_from_raw::weak_this_ when BOOST_NO_MEMBER_TEMPLATE_FRIENDS is defined. [SVN r57518] --- include/boost/smart_ptr/enable_shared_from_raw.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/boost/smart_ptr/enable_shared_from_raw.hpp b/include/boost/smart_ptr/enable_shared_from_raw.hpp index b147a01..f659c04 100644 --- a/include/boost/smart_ptr/enable_shared_from_raw.hpp +++ b/include/boost/smart_ptr/enable_shared_from_raw.hpp @@ -51,11 +51,6 @@ protected: BOOST_ASSERT( shared_this_.use_count() <= 1 ); // make sure no dangling shared_ptr objects exist } -private: - - mutable weak_ptr weak_this_; - mutable shared_ptr shared_this_; - private: void init_weak_once() const @@ -111,6 +106,10 @@ private: shared_this_.reset(); } } + + mutable weak_ptr weak_this_; +private: + mutable shared_ptr shared_this_; }; template