1 files changed, 5 insertions, 16 deletions
diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h
index 991625cd32f..968ed3d49b5 100644
--- a/ace/Atomic_Op.h
+++ b/ace/Atomic_Op.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -44,9 +44,6 @@
 #endif /* ACE_HAS_THREADS */
 
 #if defined (ACE_HAS_BUILTIN_ATOMIC_OP)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ACE_Atomic_Op<ACE_Thread_Mutex, long>
  *
@@ -64,7 +61,7 @@ public:
   ACE_Atomic_Op (void);
 
   /// Initialize <value_> to c.
-  ACE_Atomic_Op (const long &c);
+  ACE_Atomic_Op (long c);
 
   /// Manage copying...
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c);
@@ -128,13 +125,10 @@ public:
   static void init_functions (void);
 
 private:
-
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
-  ACE_Thread_Mutex &mutex (void);
-
-private:
+  ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex &mutex (void))
 
   /// Current object decorated by the atomic op.
   volatile long value_;
@@ -163,7 +157,7 @@ public:
   ACE_Atomic_Op (void);
 
   /// Initialize <value_> to c.
-  ACE_Atomic_Op (const unsigned long &c);
+  ACE_Atomic_Op (unsigned long c);
 
   /// Manage copying...
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c);
@@ -227,13 +221,10 @@ public:
   static void init_functions (void);
 
 private:
-
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
-  ACE_Thread_Mutex &mutex (void);
-
-private:
+  ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex &mutex (void))
 
   /// Current object decorated by the atomic op.
   volatile unsigned long value_;
@@ -245,8 +236,6 @@ private:
   static long (*exchange_add_fn_) (volatile long *, long);
 };
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */
 
 #if defined (__ACE_INLINE__)