1 files changed, 9 insertions, 2 deletions
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 792cecaaf79..9b1764436e1 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -22,8 +22,11 @@
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
-
-#include "ace/Atomic_Op.h"
+#if defined (ACE_HAS_CPP11)
+# include <atomic>
+#else
+# include "ace/Atomic_Op.h"
+#endif /* ACE_HAS_CPP11 */
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -381,7 +384,11 @@ 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.