summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-06-27 08:44:05 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-06-27 08:44:05 +0200
commit7165c10ea6079dd7a01d5e490a4399d40d6f26f7 (patch)
treeb9844dbd93663aa68c9ef0fe24c75f00609b4c8f
parent5cbcb4433ea1a1d193c4d9febc8f368473c15f49 (diff)
downloadATCD-7165c10ea6079dd7a01d5e490a4399d40d6f26f7.tar.gz
Moved location of new define
* TAO/tao/Object.h:
-rw-r--r--TAO/tao/Object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index fea2a1a0031..a2d2dd26fae 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -31,7 +31,6 @@
#include "tao/Arg_Traits_T.h"
#include "tao/Any_Insert_Policy_T.h"
#if defined (ACE_HAS_CPP11)
-# defined TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT
# include <atomic>
#else
# include "ace/Atomic_Op.h"
@@ -346,6 +345,7 @@ namespace CORBA
/// Number of outstanding references to this object.
#if defined (ACE_HAS_CPP11)
+# define TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT
std::atomic<uint32_t> refcount_;
#else
ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;