boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-07-31 21:24:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switched weak_count_ from #shared+#weak to #weak+(#shared != 0); thanks to Alexander Terekhov and Ben Hutchings

Browse Source 
[SVN r19246]
This commit is contained in:
Peter Dimov
2003-07-21 14:17:03 +00:00
parent 2d4eb92401
commit b4ec0e90fb
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/detail/shared_count.hpp
View File

@@ -121,7 +121,6 @@ public:
mutex_type::scoped_lock lock(mtx_); mutex_type::scoped_lock lock(mtx_);
#endif #endif
++use_count_; ++use_count_;
++weak_count_;
} }
void add_ref_lock() void add_ref_lock()
@@ -129,9 +128,8 @@ public:
#if defined(BOOST_HAS_THREADS) #if defined(BOOST_HAS_THREADS)
mutex_type::scoped_lock lock(mtx_); mutex_type::scoped_lock lock(mtx_);
#endif #endif
if(use_count_ == 0 && weak_count_ != 0) boost::throw_exception(boost::bad_weak_ptr()); if(use_count_ == 0) boost::throw_exception(boost::bad_weak_ptr());
++use_count_; ++use_count_;
++weak_count_;
} }
void release() // nothrow void release() // nothrow
@@ -142,11 +140,7 @@ public:
#endif #endif
long new_use_count = --use_count_; long new_use_count = --use_count_;
if(new_use_count != 0) if(new_use_count != 0) return;
{
--weak_count_;
return;
}
} }
dispose(); dispose();
@@ -191,10 +185,8 @@ private:
sp_counted_base(sp_counted_base const &); sp_counted_base(sp_counted_base const &);
sp_counted_base & operator= (sp_counted_base const &); sp_counted_base & operator= (sp_counted_base const &);
// inv: use_count_ <= weak_count_ long use_count_; // #shared
long weak_count_; // #weak + (#shared != 0)
long use_count_;
long weak_count_;
#if defined(BOOST_HAS_THREADS) || defined(BOOST_LWM_WIN32) #if defined(BOOST_HAS_THREADS) || defined(BOOST_LWM_WIN32)
mutable mutex_type mtx_; mutable mutex_type mtx_;