Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r57518 - trunk/boost/smart_ptr
From: fmhess_at_[hidden]
Date: 2009-11-09 11:33:36


Author: fmhess
Date: 2009-11-09 11:33:35 EST (Mon, 09 Nov 2009)
New Revision: 57518
URL: http://svn.boost.org/trac/boost/changeset/57518

Log:
Fixed access to enable_shared_from_raw::weak_this_ when
BOOST_NO_MEMBER_TEMPLATE_FRIENDS is defined.

Text files modified:
   trunk/boost/smart_ptr/enable_shared_from_raw.hpp | 9 ++++-----
   1 files changed, 4 insertions(+), 5 deletions(-)

Modified: trunk/boost/smart_ptr/enable_shared_from_raw.hpp
==============================================================================
--- trunk/boost/smart_ptr/enable_shared_from_raw.hpp (original)
+++ trunk/boost/smart_ptr/enable_shared_from_raw.hpp 2009-11-09 11:33:35 EST (Mon, 09 Nov 2009)
@@ -53,11 +53,6 @@
 
 private:
 
- mutable weak_ptr<void> weak_this_;
- mutable shared_ptr<void> shared_this_;
-
-private:
-
     void init_weak_once() const
     {
         if( weak_this_.expired() )
@@ -111,6 +106,10 @@
             shared_this_.reset();
         }
     }
+
+ mutable weak_ptr<void> weak_this_;
+private:
+ mutable shared_ptr<void> shared_this_;
 };
 
 template<typename T>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk