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

Changed debug hook names, reverted weak_ptr() to have use_count of zero.

Browse Source 
[SVN r16362]
This commit is contained in:
Peter Dimov
2002-11-21 13:14:04 +00:00
parent e32b2adfda
commit 8283ec826b
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,12 @@ namespace boost
// Debug hooks // Debug hooks
#if defined(BOOST_ENABLE_SHARED_PTR_DEBUG_HOOKS) #if defined(BOOST_ENABLE_SP_DEBUG_HOOKS)
void shared_ptr_scalar_constructor_hook(void * p); void sp_scalar_constructor_hook(void * p);
void shared_ptr_array_constructor_hook(void * p); void sp_array_constructor_hook(void * p);
void shared_ptr_scalar_destructor_hook(void * p); void sp_scalar_destructor_hook(void * p);
void shared_ptr_array_destructor_hook(void * p); void sp_array_destructor_hook(void * p);
#endif #endif
@@ -183,16 +183,16 @@ private:
#endif #endif
}; };
#if defined(BOOST_ENABLE_SHARED_PTR_DEBUG_HOOKS) #if defined(BOOST_ENABLE_SP_DEBUG_HOOKS)
template<class T> void cbi_call_constructor_hook(T * p, checked_deleter<T> const &, int) template<class T> void cbi_call_constructor_hook(T * p, checked_deleter<T> const &, int)
{ {
boost::shared_ptr_scalar_constructor_hook(p); boost::sp_scalar_constructor_hook(p);
} }
template<class T> void cbi_call_constructor_hook(T * p, checked_array_deleter<T> const &, int) template<class T> void cbi_call_constructor_hook(T * p, checked_array_deleter<T> const &, int)
{ {
boost::shared_ptr_array_constructor_hook(p); boost::sp_array_constructor_hook(p);
} }
template<class P, class D> void cbi_call_constructor_hook(P const &, D const &, long) template<class P, class D> void cbi_call_constructor_hook(P const &, D const &, long)
@@ -201,12 +201,12 @@ template<class P, class D> void cbi_call_constructor_hook(P const &, D const &,
template<class T> void cbi_call_destructor_hook(T * p, checked_deleter<T> const &, int) template<class T> void cbi_call_destructor_hook(T * p, checked_deleter<T> const &, int)
{ {
boost::shared_ptr_scalar_destructor_hook(p); boost::sp_scalar_destructor_hook(p);
} }
template<class T> void cbi_call_destructor_hook(T * p, checked_array_deleter<T> const &, int) template<class T> void cbi_call_destructor_hook(T * p, checked_array_deleter<T> const &, int)
{ {
boost::shared_ptr_array_destructor_hook(p); boost::sp_array_destructor_hook(p);
} }
template<class P, class D> void cbi_call_destructor_hook(P const &, D const &, long) template<class P, class D> void cbi_call_destructor_hook(P const &, D const &, long)
@@ -240,14 +240,14 @@ public:
counted_base_impl(P p, D d): ptr(p), del(d) counted_base_impl(P p, D d): ptr(p), del(d)
{ {
#if defined(BOOST_ENABLE_SHARED_PTR_DEBUG_HOOKS) #if defined(BOOST_ENABLE_SP_DEBUG_HOOKS)
detail::cbi_call_constructor_hook(p, d, 0); detail::cbi_call_constructor_hook(p, d, 0);
#endif #endif
} }
virtual void dispose() // nothrow virtual void dispose() // nothrow
{ {
#if defined(BOOST_ENABLE_SHARED_PTR_DEBUG_HOOKS) #if defined(BOOST_ENABLE_SP_DEBUG_HOOKS)
detail::cbi_call_destructor_hook(ptr, del, 0); detail::cbi_call_destructor_hook(ptr, del, 0);
#endif #endif
del(ptr); del(ptr);
@@ -436,7 +436,7 @@ public:
long use_count() const // nothrow long use_count() const // nothrow
{ {
return pi_ != 0? pi_->use_count(): 804; // '804' is an example of 'unspecified' return pi_ != 0? pi_->use_count(): 0;
} }
friend inline bool operator==(weak_count const & a, weak_count const & b) friend inline bool operator==(weak_count const & a, weak_count const & b)
@@ -452,7 +452,14 @@ public:
inline shared_count::shared_count(weak_count const & r): pi_(r.pi_) inline shared_count::shared_count(weak_count const & r): pi_(r.pi_)
{ {
if(pi_ != 0) pi_->add_ref(); if(pi_ != 0)
{
pi_->add_ref();
}
else
{
boost::throw_exception(boost::bad_weak_ptr());
}
} }
} // namespace detail } // namespace detail