diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-23 21:21:17 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-23 21:21:17 +0200 |
| commit | 9d5ca158661004ec2ecabc64f2ff8297c4c2e1b4 (patch) | |
| tree | 030fa05115008ac6c6535071c71530fdd0f5c1cc | |
| parent | 2aeaf51d0efe793cf67281262260b906a5b0f21c (diff) | |
| download | ATCD-9d5ca158661004ec2ecabc64f2ff8297c4c2e1b4.tar.gz | |
MacOSX doesn't have a std::atomic_uint32_t
* TAO/tao/Intrusive_Ref_Count_Base_T.h:
* TAO/tao/PortableServer/Servant_Base.h:
* TAO/tao/Profile.h:
* TAO/tao/Stub.h:
| -rw-r--r-- | TAO/tao/Intrusive_Ref_Count_Base_T.h | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Profile.h | 1 | ||||
| -rw-r--r-- | TAO/tao/Stub.h | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index f3179181295..ae30d217e4e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -37,20 +37,15 @@ template <class ACE_LOCK> class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base (void); void _add_ref (void); void _remove_ref (void); - protected: - TAO_Intrusive_Ref_Count_Base (void); - private: - ACE_Atomic_Op<ACE_LOCK, long> ref_count_; // Prevent copying/assignment. diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 8fe84c2cb89..b37018662db 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -210,7 +210,7 @@ protected: protected: /// Reference counter. #if defined (ACE_HAS_CPP11) - std::atomic_uint32_t ref_count_; + std::atomic<uint32_t> ref_count_; #else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_; #endif /* ACE_HAS_CPP11 */ diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 38c32e5cd3f..ce7505009ce 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -442,7 +442,6 @@ public: virtual int decode_endpoints (void); protected: - virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile); virtual TAO_Service_Callbacks::Profile_Equivalence is_equivalent_hook ( const TAO_Profile* other_profile); diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 0f5ac9a6bbe..792cecaaf79 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -412,7 +412,6 @@ protected: /// True if forwarding request upon some specific exceptions /// (e.g. OBJECT_NOT_EXIST) already happened. ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_; - }; // Define a TAO_Stub auto_ptr class. |