diff options
Diffstat (limited to 'TAO/tao/PortableServer/Servant_Base.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 337f773f900..704260f8cac 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -59,14 +59,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ServantBase::TAO_ServantBase (TAO_Operation_Table* optable) : TAO_Abstract_ServantBase () - , ref_count_ (1) + , refcount_ (1) , optable_ (optable) { } TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs) : TAO_Abstract_ServantBase () - , ref_count_ (1) + , refcount_ (1) , optable_ (rhs.optable_) { } @@ -655,13 +655,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( void TAO_ServantBase::_add_ref (void) { - ++this->ref_count_; + ++this->refcount_; } void TAO_ServantBase::_remove_ref (void) { - unsigned long const new_count = --this->ref_count_; + CORBA::ULong const new_count = --this->refcount_; if (new_count == 0) { @@ -673,9 +673,9 @@ CORBA::ULong TAO_ServantBase::_refcount_value (void) const { #if defined (ACE_HAS_CPP11) - return this->ref_count_; + return this->refcount_; #else - return this->ref_count_.value (); + return this->refcount_.value (); #endif /* ACE_HAS_CPP11 */ } |