forked from boostorg/smart_ptr
shared_ptr now autodetects counted_bases; minor test updates; intrusive_ptr no longer calls addref/release for NULL pointers.
[SVN r13602]
This commit is contained in:
1 parent
11eacab70e
commit
4653c3673b
4 files changed
+52
-12
No files matched your search
@@ -169,12 +169,12 @@ private:
|
||||
|
||||
inline void intrusive_ptr_add_ref(counted_base * p)
|
||||
{
|
||||
if(p != 0) p->add_ref();
|
||||
p->add_ref();
|
||||
}
|
||||
|
||||
inline void intrusive_ptr_release(counted_base * p)
|
||||
{
|
||||
if(p != 0) p->release();
|
||||
p->release();
|
||||
}
|
||||
|
||||
namespace detail
|
||||
@@ -215,6 +215,8 @@ private:
|
||||
|
||||
friend class weak_count;
|
||||
|
||||
template<class P, class D> shared_count(P, D, counted_base const *);
|
||||
|
||||
public:
|
||||
|
||||
shared_count(): pi_(new counted_base(1, 1))
|
||||
@@ -226,7 +228,7 @@ public:
|
||||
pi_->add_ref();
|
||||
}
|
||||
|
||||
template<class P, class D> shared_count(P p, D d): pi_(0)
|
||||
template<class P, class D> shared_count(P p, D d, void const * = 0): pi_(0)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -239,6 +241,11 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
template<class P, class D> shared_count(P, D, counted_base * pi): pi_(pi)
|
||||
{
|
||||
pi_->add_ref();
|
||||
}
|
||||
|
||||
#ifndef BOOST_NO_AUTO_PTR
|
||||
|
||||
// auto_ptr<Y> is special cased to provide the strong guarantee
|
||||
|
||||
Reference in new issue
Block a user