diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 46178ac6b46..a5c277a611d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -1,9 +1,8 @@ // $Id$ #include "Refcountable.h" -#include "Destroy_Callback.h" - #include "tao/debug.h" +#include "ace/Log_Msg.h" #if ! defined (__ACE_INLINE__) #include "Refcountable.inl" @@ -25,7 +24,7 @@ TAO_NS_Refcountable::_incr_refcnt (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); - if (TAO_debug_level > 0 ) + if (TAO_debug_level > 1 ) ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount_+1 )); @@ -38,7 +37,7 @@ TAO_NS_Refcountable::_decr_refcnt (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); - if (TAO_debug_level > 0 ) + if (TAO_debug_level > 1 ) ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount_-1 )); this->refcount_--; @@ -46,14 +45,7 @@ TAO_NS_Refcountable::_decr_refcnt (void) return this->refcount_; } - if (this->destroy_callback_ != 0) - this->destroy_callback_->release (); + this->release (); return 0; } - -void -TAO_NS_Refcountable::destroy_callback (TAO_NS_Destroy_Callback* destroy_callback) -{ - destroy_callback_ = destroy_callback; -} |