Merge branch 'master' into test-corba-is-nil

1 files changed, 6 insertions, 6 deletions

diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 949bf0dfccd..0b6c39a311d 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -60,7 +60,7 @@ public:
   TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0);
 
   /// Destructor.
-  virtual ~TAO_Reply_Dispatcher (void);
+  virtual ~TAO_Reply_Dispatcher ();
 
   /**
    * Dispatch the reply. Return 1 on sucess, -1 on error.
@@ -74,7 +74,7 @@ public:
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params) = 0;
 
   /// Inform that the reply timed out
-  virtual void reply_timed_out (void) = 0;
+  virtual void reply_timed_out () = 0;
 
   /**
    * The used for the pending reply has been closed.
@@ -84,12 +84,12 @@ public:
    *    the exception, it would a matter of simply adding a boolean
    *    argument to this function.
    */
-  virtual void connection_closed (void) = 0;
+  virtual void connection_closed () = 0;
 
   /// Get the locate reply status.
-  GIOP::LocateStatusType locate_reply_status (void) const;
+  GIOP::LocateStatusType locate_reply_status () const;
 
-  GIOP::ReplyStatusType reply_status (void) const;
+  GIOP::ReplyStatusType reply_status () const;
 
   static void intrusive_add_ref (TAO_Reply_Dispatcher*);
   static void intrusive_remove_ref (TAO_Reply_Dispatcher*);
@@ -103,7 +103,7 @@ protected:
 
 private:
   /// Support for intrusive reference counting
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcount_;
+  std::atomic<uint32_t> refcount_;
 
   /// Allocator that was used to allocate this reply dispatcher. In case of
   /// zero we come from the heap.