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

add_ref split to add_ref_copy and add_ref_lock to eliminate the redundant use_count_ == 0 check.

Browse Source 
[SVN r19126]
This commit is contained in:
Peter Dimov
2003-07-15 12:18:40 +00:00
parent 794de98cd1
commit 7c36a640ae
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,16 @@ public:
virtual void * get_deleter(std::type_info const & ti) = 0; virtual void * get_deleter(std::type_info const & ti) = 0;
void add_ref() void add_ref_copy()
{
#if defined(BOOST_HAS_THREADS)
mutex_type::scoped_lock lock(mtx_);
#endif
++use_count_;
++weak_count_;
}
void add_ref_lock()
{ {
#if defined(BOOST_HAS_THREADS) #if defined(BOOST_HAS_THREADS)
mutex_type::scoped_lock lock(mtx_); mutex_type::scoped_lock lock(mtx_);
@ -384,7 +393,7 @@ public:
, id_(shared_count_id) , id_(shared_count_id)
#endif #endif
{ {
if(pi_ != 0) pi_->add_ref(); if(pi_ != 0) pi_->add_ref_copy();
} }
explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0 explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0
@ -392,7 +401,7 @@ public:
shared_count & operator= (shared_count const & r) // nothrow shared_count & operator= (shared_count const & r) // nothrow
{ {
sp_counted_base * tmp = r.pi_; sp_counted_base * tmp = r.pi_;
if(tmp != 0) tmp->add_ref(); if(tmp != 0) tmp->add_ref_copy();
if(pi_ != 0) pi_->release(); if(pi_ != 0) pi_->release();
pi_ = tmp; pi_ = tmp;
@ -532,7 +541,7 @@ inline shared_count::shared_count(weak_count const & r): pi_(r.pi_)
{ {
if(pi_ != 0) if(pi_ != 0)
{ {
pi_->add_ref(); pi_->add_ref_lock();
} }
else else
{ {