1 files changed, 5 insertions, 14 deletions
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h
index c4c6f181b75..69108c9836f 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h
@@ -20,12 +20,7 @@
 #include /**/ "tao/Versioned_Namespace.h"
 
 #include "tao/Basic_Types.h"
-
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -43,20 +38,16 @@ template <class ACE_LOCK>
 class TAO_Intrusive_Ref_Count_Base
 {
 public:
-  virtual ~TAO_Intrusive_Ref_Count_Base (void);
+  virtual ~TAO_Intrusive_Ref_Count_Base ();
 
-  void _add_ref (void);
-  void _remove_ref (void);
+  void _add_ref ();
+  void _remove_ref ();
 
 protected:
-  TAO_Intrusive_Ref_Count_Base (void);
+  TAO_Intrusive_Ref_Count_Base ();
 
 private:
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<ACE_LOCK, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
   // Prevent copying/assignment.
   TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&);