diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-26 08:17:36 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-26 08:17:36 +0200 |
| commit | 1a4ad4bce2baf938893b004b267dd2a9740bf05c (patch) | |
| tree | a122f471c5603815822161acb4d071992eb832de | |
| parent | 5bcb4583a4d36e392cf41c6b47ccdb04fd55d504 (diff) | |
| download | ATCD-1a4ad4bce2baf938893b004b267dd2a9740bf05c.tar.gz | |
Revert rename of ref_count_ to refcount_
* TAO/tao/PortableServer/Servant_Base.cpp:
* TAO/tao/PortableServer/Servant_Base.h:
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 704260f8cac..2824458e957 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 () - , refcount_ (1) + , ref_count_ (1) , optable_ (optable) { } TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs) : TAO_Abstract_ServantBase () - , refcount_ (1) + , ref_count_ (1) , optable_ (rhs.optable_) { } @@ -655,13 +655,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( void TAO_ServantBase::_add_ref (void) { - ++this->refcount_; + ++this->ref_count_; } void TAO_ServantBase::_remove_ref (void) { - CORBA::ULong const new_count = --this->refcount_; + CORBA::ULong const new_count = --this->ref_count_; if (new_count == 0) { @@ -673,9 +673,9 @@ CORBA::ULong TAO_ServantBase::_refcount_value (void) const { #if defined (ACE_HAS_CPP11) - return this->refcount_; + return this->ref_count_; #else - return this->refcount_.value (); + return this->ref_count_.value (); #endif /* ACE_HAS_CPP11 */ } diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 603a33e1328..b37018662db 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -210,9 +210,9 @@ protected: protected: /// Reference counter. #if defined (ACE_HAS_CPP11) - std::atomic<uint32_t> refcount_; + std::atomic<uint32_t> ref_count_; #else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_; #endif /* ACE_HAS_CPP11 */ /// The operation table for this servant. It is initialized by the |