Layout changes, use delete, removed redundant void

    * ACE/ace/Asynch_IO.h:
    * ACE/ace/Dev_Poll_Reactor.h:
    * ACE/ace/Event_Handler_Handle_Timeout_Upcall.h:
    * ACE/ace/Future.h:
    * ACE/ace/Get_Opt.h:
    * ACE/ace/Hash_Map_Manager_T.h:
    * ACE/ace/Local_Tokens.cpp:
    * ACE/ace/Local_Tokens.h:
    * ACE/ace/SOCK_Dgram_Mcast.h:
    * ACE/ace/Select_Reactor_Base.h:

10 files changed, 6 insertions, 20 deletions

diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 819eed30e7c..6584abfc4e8 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -1556,7 +1556,6 @@ private:
   ACE_Asynch_Write_Dgram (const ACE_Asynch_Write_Dgram &) = delete;
 };
 
-
 /**
  * @class ACE_Handler
  *
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 88d30409c2e..c75cbc8cba0 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -1126,7 +1126,7 @@ protected:
     int acquire (ACE_Time_Value *max_wait = 0);
 
   private:
-    Token_Guard (void);
+    Token_Guard ();
 
   private:
     /// The Reactor token.
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
index 715cacb2c27..02133ad52ea 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
@@ -87,7 +87,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Flag indicating that reference counting is required for this
   /// event handler upcall.
   int requires_reference_counting_;
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index e928370f1e6..f63695202fa 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -214,10 +214,10 @@ private:
   mutable ACE_SYNCH_RECURSIVE_CONDITION value_ready_;
 
 private:
-  ACE_Future_Rep (void);
+  ACE_Future_Rep ();
 
 protected:
-  ~ACE_Future_Rep (void);
+  ~ACE_Future_Rep ();
 };
 
 /**
@@ -354,7 +354,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// The ACE_Future_Rep
   /// Protect operations on the <Future>.
   typedef ACE_Future_Rep<T> FUTURE_REP;
diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h
index 040df2b8cb2..96e06c30b69 100644
--- a/ACE/ace/Get_Opt.h
+++ b/ACE/ace/Get_Opt.h
@@ -434,7 +434,6 @@ private:
   ACE_Get_Opt &operator= (ACE_Get_Opt &&) = delete;
 
 private:
-
   /// Holds the option string.
   ACE_TString *optstring_;
 
@@ -481,7 +480,6 @@ private:
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 70f20f9e9ed..6960498bfe7 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -1119,7 +1119,6 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK>
 class ACE_Hash_Map_Manager : public ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>
 {
 public:
-
   /**
    * Initialize a @c Hash_Map_Manager with default size elements.
    * @param table_alloc is a pointer to a memory allocator used for
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index 2aedeb0b94c..68cd3d36df3 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -160,10 +160,6 @@ ACE_TPQ_Entry::client_id (const ACE_TCHAR *id)
                     ACE_MAXCLIENTIDLEN);
 }
 
-ACE_TSS_TPQ_Entry::~ACE_TSS_TPQ_Entry (void)
-{
-}
-
 void
 ACE_TSS_TPQ_Entry::dump () const
 {
diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h
index e52695aff37..6b137152143 100644
--- a/ACE/ace/Local_Tokens.h
+++ b/ACE/ace/Local_Tokens.h
@@ -216,7 +216,7 @@ public:
                      const ACE_TCHAR *client_id);
 
   /// Destructor.
-  virtual ~ACE_TSS_TPQ_Entry (void);
+  virtual ~ACE_TSS_TPQ_Entry () = default;
 
   /// Allows us to pass args to the construction of the TSS object.
   virtual ACE_TPQ_Entry *make_TSS_TYPE () const;
@@ -235,9 +235,8 @@ public:
 #endif /* ACE_NO_TSS_TOKENS */
 
 private:
-  /// Private: should not be used
-  ACE_TSS_TPQ_Entry (const ACE_TSS_TPQ_Entry &);
-  void operator= (const ACE_TSS_TPQ_Entry &);
+  ACE_TSS_TPQ_Entry (const ACE_TSS_TPQ_Entry &) = delete;
+  void operator= (const ACE_TSS_TPQ_Entry &) = delete;
 
   // = These are passed to the constructor of ACE_TPQ_Entry in
   // make_TSS_TYPE
diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h
index 12a885b7ac1..1fc3ab2430c 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.h
+++ b/ACE/ace/SOCK_Dgram_Mcast.h
@@ -344,7 +344,6 @@ public:
   int opts () const;
 
 private:
-
   /// Subscribe to a multicast address on one or more network interface(s).
   /// (No QoS support.)
   int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index f076a2bffeb..edac5a28aa9 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -375,7 +375,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Remove the binding of @a handle corresponding to position @a pos
   /// in accordance with the @a mask.
   int unbind (ACE_HANDLE handle,
@@ -437,7 +436,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Reference to the Handler_Repository we are iterating over.
   ACE_Select_Reactor_Handler_Repository const * const rep_;