diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 16:45:48 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 16:45:48 +0100 |
| commit | 419b95663619dcdc3efba31719c382482206875f (patch) | |
| tree | 418aac872162edda12dd42a5ed47d1abfa48008d /TAO/tao/Stub.h | |
| parent | 61cd647874bd1717fe2854421dce3d42fdb04c57 (diff) | |
| download | ATCD-419b95663619dcdc3efba31719c382482206875f.tar.gz | |
Removed checks for ACE_HAS_CPP11 and use std::atomic in more places in the TAO core
Diffstat (limited to 'TAO/tao/Stub.h')
| -rw-r--r-- | TAO/tao/Stub.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index a2b56708493..62049cb1af9 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -22,11 +22,7 @@ #include "tao/MProfile.h" #include "tao/ORB_Core_Auto_Ptr.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -384,11 +380,7 @@ protected: CORBA::Boolean profile_success_; /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// The policy overrides in this object, if nil then use the default /// policies. @@ -418,7 +410,7 @@ 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_; + std::atomic<bool> forwarded_on_exception_; }; // Define a TAO_Stub auto_ptr class. |