Various cleanup and use of C++11 features

254 files changed, 356 insertions, 944 deletions

diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp
index d7af2f8457c..77353632b4d 100644
--- a/ACE/ace/ARGV.cpp
+++ b/ACE/ace/ARGV.cpp
@@ -301,7 +301,6 @@ ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args)
 }
 
 // Free up argv_ and buf_
-
 template <typename CHAR_TYPE>
 ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T ()
 {
diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h
index aa8c4b8ef10..3d41fd0f4a4 100644
--- a/ACE/ace/Activation_Queue.h
+++ b/ACE/ace/Activation_Queue.h
@@ -73,7 +73,7 @@ public:
    *                  Defaults to ACE_Allocator::instance().
    */
   ACE_Activation_Queue (ACE_Message_Queue<ACE_SYNCH> *new_queue = 0,
-                        ACE_Allocator *alloc = 0,
+                        ACE_Allocator *alloc = nullptr,
                         ACE_Allocator *db_alloc = 0);
 
   /// Destructor.
@@ -139,7 +139,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   /// Stores the Method_Requests.
   ACE_Message_Queue<ACE_SYNCH> *queue_;
 
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 8bfb7afcc5c..d17c9426406 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_ACTIVE_MAP_MANAGER_T_H
 #define ACE_ACTIVE_MAP_MANAGER_T_H
 #include /**/ "ace/pre.h"
@@ -50,11 +49,11 @@ public:
   typedef REVERSE_ITERATOR reverse_iterator;
 
   /// Initialize a Active_Map_Manager with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Active_Map_Manager (ACE_Allocator *alloc = 0);
+  ACE_Active_Map_Manager (ACE_Allocator *alloc = nullptr);
 
   /// Initialize a Active_Map_Manager with @a size entries.
   ACE_Active_Map_Manager (size_t size,
-                          ACE_Allocator *alloc = 0);
+                          ACE_Allocator *alloc = nullptr);
 
   /// Close down a Active_Map_Manager and release dynamically
   /// allocated resources.
@@ -62,7 +61,7 @@ public:
 
   /// Initialize a Active_Map_Manager with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-            ACE_Allocator *alloc = 0);
+            ACE_Allocator *alloc = nullptr);
 
   /// Close down a Active_Map_Manager and release dynamically
   /// allocated resources.
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index a0899b7b596..9d2803ad7db 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -704,7 +704,7 @@ public:
     ACE_Asynch_Read_File_Result_Impl *implementation_;
 
   private:
-    /// Here just to provide an dummpy implementation, since the
+    /// Here just to provide an dummy implementation, since the
     /// one auto generated by MSVC is flagged as infinitely recursive
     void operator= (Result &) {}
   };
@@ -838,7 +838,7 @@ public:
     ACE_Asynch_Write_File_Result_Impl *implementation_;
 
   private:
-    /// Here just to provide an dummpy implementation, since the
+    /// Here just to provide an dummy implementation, since the
     /// one auto generated by MSVC is flagged as infinitely recursive
     void operator= (Result &) {};
   };
diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h
index d57fd71e718..d2eaed88033 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Auto_Event.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h
index 72d98af0f47..78916c408c8 100644
--- a/ACE/ace/Auto_IncDec_T.h
+++ b/ACE/ace/Auto_IncDec_T.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_AUTO_INCDEC_T_H
 #define ACE_AUTO_INCDEC_T_H
 
diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h
index 58cba3f2610..0f5eccd1f6a 100644
--- a/ACE/ace/Barrier.h
+++ b/ACE/ace/Barrier.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Barrier.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -38,9 +36,9 @@ class ACE_Export ACE_Barrier
 {
 public:
   ACE_Barrier (unsigned int, const ACE_TCHAR * = 0, void * = 0) {}
-  ~ACE_Barrier (void) {}
-  int wait (void) { ACE_NOTSUP_RETURN (-1); }
-  void dump (void) const {}
+  ~ACE_Barrier () = default;
+  int wait () { ACE_NOTSUP_RETURN (-1); }
+  void dump () const {}
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -149,9 +147,8 @@ protected:
   ACE_Sub_Barrier *sub_barrier_[2];
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Barrier &);
-  ACE_Barrier (const ACE_Barrier &);
+  void operator= (const ACE_Barrier &) = delete;
+  ACE_Barrier (const ACE_Barrier &) = delete;
 };
 
 /**
diff --git a/ACE/ace/Base_Thread_Adapter.inl b/ACE/ace/Base_Thread_Adapter.inl
index f2ea0636e59..667b9f50a3a 100644
--- a/ACE/ace/Base_Thread_Adapter.inl
+++ b/ACE/ace/Base_Thread_Adapter.inl
@@ -36,7 +36,7 @@ ACE_Base_Thread_Adapter::entry_point ()
 
 #ifdef ACE_USES_GPROF
 ACE_INLINE itimerval*
-ACE_Base_Thread_Adapter::timerval (void)
+ACE_Base_Thread_Adapter::timerval ()
 {
   return &(this->itimer_);
 }
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index 38bee2de970..a090df83683 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -94,7 +94,7 @@ public:
   /// @a size entries.
   ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy,
                          size_t size = ACE_DEFAULT_MAP_SIZE,
-                         ACE_Allocator *alloc = 0);
+                         ACE_Allocator *alloc = nullptr);
 
   /// Close down a <Cache_Map_Manager> and release dynamically allocated
   /// resources.
@@ -102,7 +102,7 @@ public:
 
   /// Initialize a cache with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-            ACE_Allocator *alloc = 0);
+            ACE_Allocator *alloc = nullptr);
 
   /// Close down a cache and release dynamically allocated resources.
   int close (void);
diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h
index 7f839901d1f..08e26bac57c 100644
--- a/ACE/ace/Cleanup.h
+++ b/ACE/ace/Cleanup.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h
index 6440e7dad8c..4809f4a0fa8 100644
--- a/ACE/ace/Codecs.h
+++ b/ACE/ace/Codecs.h
@@ -81,12 +81,11 @@ public:
 
 protected:
   // Prevent default construction.
-  ACE_Base64 (void) {}
+  ACE_Base64 () = default;
 
 private:
-  // Preventing copying and assignment.
-  ACE_Base64 (ACE_Base64 const &);
-  ACE_Base64 & operator= (ACE_Base64 const &);
+  ACE_Base64 (ACE_Base64 const &) = delete;
+  ACE_Base64 & operator= (ACE_Base64 const &) = delete;
 
   /// Initialize the tables for encoding/decoding.
   static void init (void);
diff --git a/ACE/ace/Condition_Attributes.cpp b/ACE/ace/Condition_Attributes.cpp
index 9257b602dfe..525a88c5f2a 100644
--- a/ACE/ace/Condition_Attributes.cpp
+++ b/ACE/ace/Condition_Attributes.cpp
@@ -2,8 +2,6 @@
 /**
  * @file Condition_Attributes.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h
index b678536da34..ef89629acf7 100644
--- a/ACE/ace/Condition_Attributes.h
+++ b/ACE/ace/Condition_Attributes.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Condition_Attributes.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -41,9 +39,8 @@ protected:
   ACE_condattr_t attributes_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes &);
-  ACE_Condition_Attributes (const ACE_Condition_Attributes &);
+  void operator= (const ACE_Condition_Attributes &) = delete;
+  ACE_Condition_Attributes (const ACE_Condition_Attributes &) = delete;
 };
 
 template <class TIME_POLICY>
@@ -56,12 +53,11 @@ public:
   {}
 
   /// Destructor
-  ~ACE_Condition_Attributes_T () {}
+  ~ACE_Condition_Attributes_T () = default;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes_T<TIME_POLICY> &);
-  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<TIME_POLICY> &);
+  void operator= (const ACE_Condition_Attributes_T<TIME_POLICY> &) = delete;
+  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<TIME_POLICY> &) = delete;
 };
 
 class ACE_Monotonic_Time_Policy;
@@ -78,9 +74,8 @@ public:
   ~ACE_Condition_Attributes_T ();
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &);
-  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &);
+  void operator= (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &) = delete;
+  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
index 73e60ef7d20..8b05327c5ac 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -3,8 +3,6 @@
 /**
  * @file Condition_Recursive_Thread_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h
index 816f08c7f2c..5a641784156 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.h
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Condition_Recursive_Thread_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -87,9 +85,8 @@ public:
   void dump () const;
 
 private:
-  // = Prevent assignment and copying.
-  void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &);
-  ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &);
+  void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &) = delete;
+  ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &) = delete;
 
 private:
   /// A normal (i.e., non-recursive) condition variable.
diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h
index 0a79a413f9e..34523edb875 100644
--- a/ACE/ace/Condition_T.h
+++ b/ACE/ace/Condition_T.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Condition_T.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -114,7 +112,6 @@ protected:
   MUTEX &mutex_;
 
 private:
-  // = Prevent assignment and initialization.
   void operator= (const ACE_Condition<MUTEX> &) = delete;
   ACE_Condition (const ACE_Condition<MUTEX> &) = delete;
 };
diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp
index fbc64708bdc..59a8a7f4de6 100644
--- a/ACE/ace/Condition_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Thread_Mutex.cpp
@@ -2,8 +2,6 @@
 /**
  * @file Condition_Thread_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h
index 855adcba377..73346f0c97e 100644
--- a/ACE/ace/Condition_Thread_Mutex.h
+++ b/ACE/ace/Condition_Thread_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Condition_Thread_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -125,9 +123,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition<ACE_Thread_Mutex> &);
-  ACE_Condition (const ACE_Condition<ACE_Thread_Mutex> &);
+  void operator= (const ACE_Condition<ACE_Thread_Mutex> &) = delete;
+  ACE_Condition (const ACE_Condition<ACE_Thread_Mutex> &) = delete;
 };
 
 typedef ACE_Condition<ACE_Thread_Mutex> ACE_Condition_Thread_Mutex;
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index b342fe1180f..3af48b4d44b 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -38,7 +38,7 @@ template <class SVC_HANDLER>
 class ACE_Connector_Base
 {
 public:
-  virtual ~ACE_Connector_Base (void) {}
+  virtual ~ACE_Connector_Base () = default;
 
   /// Initialize the Svc_Handler.
   virtual void initialize_svc_handler (ACE_HANDLE handle,
@@ -46,7 +46,7 @@ public:
 
   /// Return the handle set representing the non-blocking connects in
   /// progress.
-  virtual ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void) = 0;
+  virtual ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles () = 0;
 };
 
 /**
@@ -64,7 +64,7 @@ public:
                                    long timer_id);
 
   /// Destructor.
-  ~ACE_NonBlocking_Connect_Handler (void);
+  ~ACE_NonBlocking_Connect_Handler ();
 
   /// Close up and return underlying SVC_HANDLER through @c sh.
   /**
@@ -81,16 +81,16 @@ public:
   bool close (SVC_HANDLER *&sh);
 
   /// Get SVC_HANDLER.
-  SVC_HANDLER *svc_handler (void);
+  SVC_HANDLER *svc_handler ();
 
   /// Get handle.
-  ACE_HANDLE handle (void);
+  ACE_HANDLE handle ();
 
   /// Set handle.
   void handle (ACE_HANDLE);
 
   /// Get timer id.
-  long timer_id (void);
+  long timer_id ();
 
   /// Set timer id.
   void timer_id (long timer_id);
@@ -113,7 +113,7 @@ public:
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
 
   /// Should Reactor resume us if we have been suspended before the upcall?
-  virtual int resume_handler (void);
+  virtual int resume_handler ();
 
   /// Dump the state of an object.
   void dump () const;
@@ -191,7 +191,7 @@ public:
                     int flags = 0);
 
   /// Shutdown a connector and release resources.
-  virtual ~ACE_Connector (void);
+  virtual ~ACE_Connector ();
 
   // = Connection establishment methods.
 
@@ -260,10 +260,10 @@ public:
 
   /// Close down the Connector.  All pending non-blocking connects are
   /// canceled and the corresponding svc_handler is closed.
-  virtual int close (void);
+  virtual int close ();
 
   /// Return the underlying PEER_CONNECTOR object.
-  virtual PEER_CONNECTOR &connector (void) const;
+  virtual PEER_CONNECTOR &connector () const;
 
   /// Initialize Svc_Handler.
   virtual void initialize_svc_handler (ACE_HANDLE handle,
@@ -273,7 +273,7 @@ public:
   virtual void reactor (ACE_Reactor *reactor);
 
   /// Get Reactor.
-  virtual ACE_Reactor *reactor (void) const;
+  virtual ACE_Reactor *reactor () const;
 
   /// Dump the state of an object.
   void dump () const;
@@ -364,11 +364,11 @@ protected:
   // = Service management hooks.
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int resume (void);
+  virtual int resume ();
 
 private:
   /// This is the peer connector factory.
@@ -387,7 +387,6 @@ private:
 
   /// Handle set representing the non-blocking connects in progress.
   ACE_Unbounded_Set<ACE_HANDLE> non_blocking_handles_;
-
 };
 
 /**
diff --git a/ACE/ace/DEV.cpp b/ACE/ace/DEV.cpp
index ca87efd7056..984892b9aaf 100644
--- a/ACE/ace/DEV.cpp
+++ b/ACE/ace/DEV.cpp
@@ -10,8 +10,6 @@
 #include "ace/DEV.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV)
diff --git a/ACE/ace/DEV_IO.cpp b/ACE/ace/DEV_IO.cpp
index 87394d9dc1b..617d72e80b8 100644
--- a/ACE/ace/DEV_IO.cpp
+++ b/ACE/ace/DEV_IO.cpp
@@ -8,9 +8,6 @@
 #include "ace/DEV_IO.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO)
diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp
index 27a0e83d40d..b5880d09d0c 100644
--- a/ACE/ace/DLL.cpp
+++ b/ACE/ace/DLL.cpp
@@ -9,9 +9,7 @@
 
 #include <algorithm>
 
-
-
-  ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor. Also, by default, the object will be closed
 // before it is destroyed.
diff --git a/ACE/ace/Date_Time.h b/ACE/ace/Date_Time.h
index 4c3484a727e..8f9dde69a74 100644
--- a/ACE/ace/Date_Time.h
+++ b/ACE/ace/Date_Time.h
@@ -31,7 +31,7 @@ class ACE_Export ACE_Date_Time
 {
 public:
   /// Constructor initializes current time/date info.
-  ACE_Date_Time (void);
+  ACE_Date_Time ();
 
   /// Constructor initializes with the given ACE_Time_Value
   explicit ACE_Date_Time (const ACE_Time_Value& timevalue);
@@ -48,55 +48,55 @@ public:
                  long wday = 0);
 
   /// Update to the current time/date.
-  void update (void);
+  void update ();
 
   /// Update to the given ACE_Time_Value
   void update (const ACE_Time_Value& timevalue);
 
   /// Get day.
-  long day (void) const;
+  long day () const;
 
   /// Set day.
   void day (long day);
 
   /// Get month.
-  long month (void) const;
+  long month () const;
 
   /// Set month.
   void month (long month);
 
   /// Get year.
-  long year (void) const;
+  long year () const;
 
   /// Set year.
   void year (long year);
 
   /// Get hour.
-  long hour (void) const;
+  long hour () const;
 
   /// Set hour.
   void hour (long hour);
 
   /// Get minute.
-  long minute (void) const;
+  long minute () const;
 
   /// Set minute.
   void minute (long minute);
 
   /// Get second.
-  long second (void) const;
+  long second () const;
 
   /// Set second.
   void second (long second);
 
   /// Get microsec.
-  long microsec (void) const;
+  long microsec () const;
 
   /// Set microsec.
   void microsec (long microsec);
 
   /// Get weekday.
-  long weekday (void) const;
+  long weekday () const;
 
   /// Set weekday.
   void weekday (long wday);
diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl
index 196f572befd..ef2a39b4d3e 100644
--- a/ACE/ace/Date_Time.inl
+++ b/ACE/ace/Date_Time.inl
@@ -40,7 +40,7 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue)
 }
 
 ACE_INLINE void
-ACE_Date_Time::update (void)
+ACE_Date_Time::update ()
 {
   ACE_TRACE ("ACE_Date_Time::update");
 
@@ -48,7 +48,7 @@ ACE_Date_Time::update (void)
 }
 
 ACE_INLINE
-ACE_Date_Time::ACE_Date_Time (void)
+ACE_Date_Time::ACE_Date_Time ()
 {
   ACE_TRACE ("ACE_Date_Time::ACE_Date_Time");
   this->update ();
@@ -87,7 +87,7 @@ ACE_Date_Time::ACE_Date_Time (long day,
 
 // get day
 ACE_INLINE long
-ACE_Date_Time::day (void) const
+ACE_Date_Time::day () const
 {
   ACE_TRACE ("ACE_Date_Time::day");
   return day_;
@@ -103,7 +103,7 @@ ACE_Date_Time::day (long day)
 
 // get month
 ACE_INLINE long
-ACE_Date_Time::month (void) const
+ACE_Date_Time::month () const
 {
   ACE_TRACE ("ACE_Date_Time::month");
   return month_;
@@ -119,7 +119,7 @@ ACE_Date_Time::month (long month)
 
 // get year
 ACE_INLINE long
-ACE_Date_Time::year (void) const
+ACE_Date_Time::year () const
 {
   ACE_TRACE ("ACE_Date_Time::year");
   return year_;
@@ -135,7 +135,7 @@ ACE_Date_Time::year (long year)
 
 // get hour
 ACE_INLINE long
-ACE_Date_Time::hour (void) const
+ACE_Date_Time::hour () const
 {
   ACE_TRACE ("ACE_Date_Time::hour");
   return hour_;
@@ -151,7 +151,7 @@ ACE_Date_Time::hour (long hour)
 
 // get minute
 ACE_INLINE long
-ACE_Date_Time::minute (void) const
+ACE_Date_Time::minute () const
 {
   ACE_TRACE ("ACE_Date_Time::minute");
   return minute_;
@@ -167,7 +167,7 @@ ACE_Date_Time::minute (long minute)
 
 // get second
 ACE_INLINE long
-ACE_Date_Time::second (void) const
+ACE_Date_Time::second () const
 {
   ACE_TRACE ("ACE_Date_Time::second");
   return second_;
@@ -183,7 +183,7 @@ ACE_Date_Time::second (long second)
 
 // get microsec
 ACE_INLINE long
-ACE_Date_Time::microsec (void) const
+ACE_Date_Time::microsec () const
 {
   ACE_TRACE ("ACE_Date_Time::microsec");
   return microsec_;
@@ -199,7 +199,7 @@ ACE_Date_Time::microsec (long microsec)
 
 // get wday
 ACE_INLINE long
-ACE_Date_Time::weekday (void) const
+ACE_Date_Time::weekday () const
 {
   ACE_TRACE ("ACE_Date_Time::weekday");
   return wday_;
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h
index 383679a1eac..dc1f2e6de40 100644
--- a/ACE/ace/Default_Constants.h
+++ b/ACE/ace/Default_Constants.h
@@ -364,7 +364,7 @@
 // elements.
 # define ACE_FREE_LIST_WITH_POOL 1
 
-// A simple free list which doen't allocate/deallocate elements.
+// A simple free list which doesn't allocate/deallocate elements.
 # define ACE_PURE_FREE_LIST 2
 
 # if defined (ACE_WIN32)
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 8229aafbe57..46c8ae9cc03 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -24,7 +24,6 @@
 # include "ace/Dev_Poll_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
-
 #include "ace/Handle_Set.h"
 #include "ace/Reactor.h"
 #include "ace/Timer_Heap.h"
diff --git a/ACE/ace/Dump.h b/ACE/ace/Dump.h
index 09eafd1a6f4..c07193a5b0b 100644
--- a/ACE/ace/Dump.h
+++ b/ACE/ace/Dump.h
@@ -72,10 +72,10 @@ public:
   ACE_Dumpable (const void *);
 
   /// This pure virtual method must be filled in by a subclass.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 
 protected:
-  virtual ~ACE_Dumpable (void);
+  virtual ~ACE_Dumpable ();
 
 private:
   /// Pointer to the object that is being stored.
diff --git a/ACE/ace/Dynamic_Message_Strategy.cpp b/ACE/ace/Dynamic_Message_Strategy.cpp
index 600e9afc60a..5bad52c38b2 100644
--- a/ACE/ace/Dynamic_Message_Strategy.cpp
+++ b/ACE/ace/Dynamic_Message_Strategy.cpp
@@ -12,7 +12,6 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ctor
-
 ACE_Dynamic_Message_Strategy::ACE_Dynamic_Message_Strategy (unsigned long static_bit_field_mask,
                                                             unsigned long static_bit_field_shift,
                                                             unsigned long dynamic_priority_max,
diff --git a/ACE/ace/Dynamic_Service.cpp b/ACE/ace/Dynamic_Service.cpp
index 8bf6871d1d9..e771a814b2b 100644
--- a/ACE/ace/Dynamic_Service.cpp
+++ b/ACE/ace/Dynamic_Service.cpp
@@ -15,7 +15,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 template <class TYPE> TYPE *
 ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name)
 {
diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp
index 4e8f6d129a8..3cb945b39ae 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.cpp
+++ b/ACE/ace/ETCL/ETCL_Constraint.cpp
@@ -12,11 +12,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ETCL_Constraint::ETCL_Constraint (void)
+ETCL_Constraint::ETCL_Constraint ()
 {
 }
 
-ETCL_Constraint::~ETCL_Constraint (void)
+ETCL_Constraint::~ETCL_Constraint ()
 {
 }
 
@@ -29,8 +29,7 @@ ETCL_Constraint::accept (ETCL_Constraint_Visitor * /* visitor */)
 // ****************************************************************
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    const ETCL_Literal_Constraint & lit
-  )
+    const ETCL_Literal_Constraint & lit)
   : ETCL_Constraint(),
     type_ (ACE_ETCL_UNKNOWN)
 {
@@ -50,8 +49,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Boolean boolean
-  )
+    ACE_CDR::Boolean boolean)
   : type_ (ACE_ETCL_BOOLEAN)
 {
   this->op_.bool_ = boolean;
@@ -122,7 +120,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::ULong (void) const
   }
 }
 
-ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const
+ETCL_Literal_Constraint::operator ACE_CDR::Long () const
 {
   switch (this->type_)
   {
@@ -147,7 +145,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const
   }
 }
 
-ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const
+ETCL_Literal_Constraint::operator ACE_CDR::Double () const
 {
   switch (this->type_)
   {
@@ -163,7 +161,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const
   }
 }
 
-ETCL_Literal_Constraint::operator const char* (void) const
+ETCL_Literal_Constraint::operator const char* () const
 {
   switch (this->type_)
   {
@@ -537,9 +535,6 @@ ETCL_Component_Array::accept (ETCL_Constraint_Visitor *visitor)
 
 // ****************************************************************
 
-ETCL_Special::~ETCL_Special (void)
-{}
-
 int
 ETCL_Special::accept (ETCL_Constraint_Visitor *visitor)
 {
diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index 1e4ddf7aac7..96dc8e1909b 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -262,16 +262,16 @@ private:
 class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint
 {
 public:
-  ETCL_Special ();
+  ETCL_Special () = default;
   ETCL_Special (int type);
-  virtual ~ETCL_Special ();
+  ~ETCL_Special () override = default;
 
   int type () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
 private:
-  int type_;
+  int type_ {};
 };
 
 class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
@@ -387,7 +387,7 @@ private:
 class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint
 {
 public:
-  ETCL_Preference ();
+  ETCL_Preference () = default;
   ETCL_Preference (int type,
                    ETCL_Constraint *subexpr = 0);
   virtual ~ETCL_Preference ();
@@ -398,8 +398,8 @@ public:
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
 private:
-  int type_;
-  ETCL_Constraint *subexpr_;
+  int type_ {};
+  ETCL_Constraint *subexpr_ {};
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl
index b10fd67cd31..6caa59440bf 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.inl
+++ b/ACE/ace/ETCL/ETCL_Constraint.inl
@@ -159,11 +159,6 @@ ETCL_Component_Array::component () const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Special::ETCL_Special ()
-  : type_ (0)
-{}
-
-ACE_INLINE
 ETCL_Special::ETCL_Special (int type)
   : type_ (type)
 {}
@@ -306,12 +301,6 @@ ETCL_Binary_Expr::lhs () const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Preference::ETCL_Preference ()
-  : type_ (0),
-    subexpr_ (0)
-{}
-
-ACE_INLINE
 ETCL_Preference::ETCL_Preference (int type,
                                   ETCL_Constraint *subexpr)
   : type_ (type),
diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h
index d0ebcb0c160..bd1270deea3 100644
--- a/ACE/ace/Event.h
+++ b/ACE/ace/Event.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Event.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -63,14 +61,12 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   /// The policy to return the current time of day
   TIME_POLICY time_policy_;
 
 private:
-  // = Prevent copying.
-  ACE_Event_T (const ACE_Event_T<TIME_POLICY>& event);
-  const ACE_Event_T &operator= (const ACE_Event_T<TIME_POLICY> &rhs);
+  ACE_Event_T (const ACE_Event_T<TIME_POLICY>& event) = delete;
+  const ACE_Event_T &operator= (const ACE_Event_T<TIME_POLICY> &rhs) = delete;
 };
 
 typedef ACE_Event_T<ACE_System_Time_Policy> ACE_Event;
diff --git a/ACE/ace/Event_Base.h b/ACE/ace/Event_Base.h
index aaef456772b..da982122ff1 100644
--- a/ACE/ace/Event_Base.h
+++ b/ACE/ace/Event_Base.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Event_Base.h
  *
- *   Moved from Synch.h.
- *
  *  @author Martin Corino <mcorino@remedy.nl>
  */
 //==========================================================================
@@ -124,9 +122,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent copying.
-  ACE_Event_Base (const ACE_Event_Base& event);
-  const ACE_Event_Base &operator= (const ACE_Event_Base &rhs);
+  ACE_Event_Base (const ACE_Event_Base& event) = delete;
+  const ACE_Event_Base &operator= (const ACE_Event_Base &rhs) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h
index e4a1c6bbe96..d904aec15be 100644
--- a/ACE/ace/Event_Handler_T.h
+++ b/ACE/ace/Event_Handler_T.h
@@ -110,28 +110,28 @@ public:
 
   // = Get/set the target pointer-to-method used for dispatching.
 
-  GET_HANDLE handle_get (void);
+  GET_HANDLE handle_get ();
   void handle_get (GET_HANDLE);
 
-  SET_HANDLE handle_set (void);
+  SET_HANDLE handle_set ();
   void handle_set (SET_HANDLE);
 
-  IO_HANDLER input_handler (void);
+  IO_HANDLER input_handler ();
   void input_handler (IO_HANDLER);
 
-  IO_HANDLER output_handler (void);
+  IO_HANDLER output_handler ();
   void output_handler (IO_HANDLER);
 
-  IO_HANDLER except_handler (void);
+  IO_HANDLER except_handler ();
   void except_handler (IO_HANDLER);
 
-  TO_HANDLER to_handler (void);
+  TO_HANDLER to_handler ();
   void to_handler (TO_HANDLER);
 
-  CL_HANDLER cl_handler (void);
+  CL_HANDLER cl_handler ();
   void cl_handler (CL_HANDLER);
 
-  SIG_HANDLER sig_handler (void);
+  SIG_HANDLER sig_handler ();
   void sig_handler (SIG_HANDLER);
 
   /// Dump the state of an object.
diff --git a/ACE/ace/FIFO_Recv.cpp b/ACE/ace/FIFO_Recv.cpp
index c7569baa29a..2fd920b13a2 100644
--- a/ACE/ace/FIFO_Recv.cpp
+++ b/ACE/ace/FIFO_Recv.cpp
@@ -9,8 +9,6 @@
 #include "ace/FIFO_Recv.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
diff --git a/ACE/ace/FIFO_Send.cpp b/ACE/ace/FIFO_Send.cpp
index 3c37bd53410..fc92f1c172b 100644
--- a/ACE/ace/FIFO_Send.cpp
+++ b/ACE/ace/FIFO_Send.cpp
@@ -8,8 +8,6 @@
 #include "ace/FIFO_Send.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send)
diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h
index 01aa7d52836..0ffa228a0d8 100644
--- a/ACE/ace/FIFO_Send.h
+++ b/ACE/ace/FIFO_Send.h
@@ -39,7 +39,7 @@ public:
   /// To use non-blocking behavior include ACE_NONBLOCK in @a flags.
   //@{
   /// Default constructor.
-  ACE_FIFO_Send (void);
+  ACE_FIFO_Send ();
 
   /// Open up a bytestream named pipe for writing.
   ACE_FIFO_Send (const ACE_TCHAR *rendezvous,
diff --git a/ACE/ace/FIFO_Send_Msg.cpp b/ACE/ace/FIFO_Send_Msg.cpp
index d97e0fc3b01..117d8c96bdb 100644
--- a/ACE/ace/FIFO_Send_Msg.cpp
+++ b/ACE/ace/FIFO_Send_Msg.cpp
@@ -10,8 +10,6 @@
 #include "ace/FIFO_Send_Msg.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg)
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index 94df37e49a1..9cf86ef6228 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -14,8 +14,6 @@
 #include "ace/FILE.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE)
diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp
index 624d888d96e..733339af790 100644
--- a/ACE/ace/FILE_Addr.cpp
+++ b/ACE/ace/FILE_Addr.cpp
@@ -9,8 +9,6 @@
 #include "ace/FILE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Addr)
diff --git a/ACE/ace/FILE_Connector.cpp b/ACE/ace/FILE_Connector.cpp
index b49f8dcfff7..c9585a99633 100644
--- a/ACE/ace/FILE_Connector.cpp
+++ b/ACE/ace/FILE_Connector.cpp
@@ -9,8 +9,6 @@
 #include "ace/FILE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector)
diff --git a/ACE/ace/FILE_IO.cpp b/ACE/ace/FILE_IO.cpp
index 315779568b5..681b6c53885 100644
--- a/ACE/ace/FILE_IO.cpp
+++ b/ACE/ace/FILE_IO.cpp
@@ -12,8 +12,6 @@
 #include "ace/FILE_IO.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO)
diff --git a/ACE/ace/File_Lock.cpp b/ACE/ace/File_Lock.cpp
index aae97dd8afc..64f69138307 100644
--- a/ACE/ace/File_Lock.cpp
+++ b/ACE/ace/File_Lock.cpp
@@ -8,8 +8,6 @@
 #include "ace/File_Lock.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h
index 45ea9b14bde..12c06e062a3 100644
--- a/ACE/ace/File_Lock.h
+++ b/ACE/ace/File_Lock.h
@@ -153,9 +153,8 @@ protected:
   bool const unlink_in_destructor_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_File_Lock &);
-  ACE_File_Lock (const ACE_File_Lock &);
+  void operator= (const ACE_File_Lock &) = delete;
+  ACE_File_Lock (const ACE_File_Lock &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Functor.cpp b/ACE/ace/Functor.cpp
index 8d41b4062f9..6fff54a99b5 100644
--- a/ACE/ace/Functor.cpp
+++ b/ACE/ace/Functor.cpp
@@ -29,8 +29,6 @@
 #include "ace/Functor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Command_Base::~ACE_Command_Base ()
diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h
index c3b6deb2bb1..25846ef109e 100644
--- a/ACE/ace/Functor_T.h
+++ b/ACE/ace/Functor_T.h
@@ -180,7 +180,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Functor_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index e85ff7f5dfa..575c17a91be 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Guard_T.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -123,7 +121,6 @@ protected:
   int owner_;
 
 private:
-  // = Prevent assignment and initialization.
   void operator= (const ACE_Guard<ACE_LOCK> &) = delete;
   ACE_Guard (const ACE_Guard<ACE_LOCK> &) = delete;
 };
diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h
index 1f4dc540448..0865ffa7a98 100644
--- a/ACE/ace/Hash_Cache_Map_Manager_T.h
+++ b/ACE/ace/Hash_Cache_Map_Manager_T.h
@@ -75,7 +75,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
   /// Initialize a <Hash_Cache_Map_Manager> with @a size entries.
   ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
                               size_t size = ACE_DEFAULT_MAP_SIZE,
-                              ACE_Allocator *alloc = 0);
+                              ACE_Allocator *alloc = nullptr);
 
   /// Close down a <Cache_Map_Manager> and release dynamically allocated
   /// resources.
diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp
index c88f8830f55..a7a0aa3efc6 100644
--- a/ACE/ace/IPC_SAP.cpp
+++ b/ACE/ace/IPC_SAP.cpp
@@ -13,8 +13,6 @@
 #include "ace/IPC_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
diff --git a/ACE/ace/Intrusive_List.cpp b/ACE/ace/Intrusive_List.cpp
index 54bafc4c7b7..0d4c5fdb690 100644
--- a/ACE/ace/Intrusive_List.cpp
+++ b/ACE/ace/Intrusive_List.cpp
@@ -13,18 +13,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class T>
-ACE_Intrusive_List<T>::ACE_Intrusive_List ()
-  : head_ (0)
-  , tail_ (0)
-{
-}
-
-template<class T>
-ACE_Intrusive_List<T>::~ACE_Intrusive_List ()
-{
-}
-
 template<class T> void
 ACE_Intrusive_List<T>::push_back (T *node)
 {
diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h
index d5ba0534d41..c5017cd730c 100644
--- a/ACE/ace/Intrusive_List.h
+++ b/ACE/ace/Intrusive_List.h
@@ -57,10 +57,10 @@ class ACE_Intrusive_List
 public:
   /// Constructor.  Use user specified allocation strategy
   /// if specified.
-  ACE_Intrusive_List ();
+  ACE_Intrusive_List () = default;
 
   /// Destructor.
-  ~ACE_Intrusive_List ();
+  ~ACE_Intrusive_List () = default;
 
   // = Check boundary conditions.
 
@@ -112,10 +112,10 @@ private:
 
 private:
   /// Head of the list
-  T *head_;
+  T *head_ {};
 
   /// Tail of the list
-  T *tail_;
+  T *tail_ {};
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Intrusive_List_Node.cpp b/ACE/ace/Intrusive_List_Node.cpp
index 74f27993d02..52d1d2d6e2d 100644
--- a/ACE/ace/Intrusive_List_Node.cpp
+++ b/ACE/ace/Intrusive_List_Node.cpp
@@ -11,15 +11,4 @@
 #include "ace/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template<class T>
-ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node ()
-  : prev_ (0)
-  , next_ (0)
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* ACE_INTRUSIVE_LIST_NODE_CPP */
diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h
index 366083712e5..8fe5c40b205 100644
--- a/ACE/ace/Intrusive_List_Node.h
+++ b/ACE/ace/Intrusive_List_Node.h
@@ -56,12 +56,12 @@ protected:
    * The constructor is protected, because only derived classes should
    * be instantiated.
    */
-  ACE_Intrusive_List_Node ();
+  ACE_Intrusive_List_Node () = default;
 
 private:
   /// Head and tail of the list
-  T *prev_;
-  T *next_;
+  T *prev_ {};
+  T *next_ {};
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp
index ef57f5448c7..f09bb8a3d1a 100644
--- a/ACE/ace/LSOCK.cpp
+++ b/ACE/ace/LSOCK.cpp
@@ -1,7 +1,5 @@
 #include "ace/LSOCK.h"
 
-
-
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #include "ace/Log_Category.h"
diff --git a/ACE/ace/LSOCK_CODgram.cpp b/ACE/ace/LSOCK_CODgram.cpp
index 6f28664991a..51f51b31b90 100644
--- a/ACE/ace/LSOCK_CODgram.cpp
+++ b/ACE/ace/LSOCK_CODgram.cpp
@@ -6,8 +6,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/LSOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/LSOCK_Connector.cpp b/ACE/ace/LSOCK_Connector.cpp
index 45bb9c67249..3a0f6064037 100644
--- a/ACE/ace/LSOCK_Connector.cpp
+++ b/ACE/ace/LSOCK_Connector.cpp
@@ -6,9 +6,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/LSOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/LSOCK_Dgram.cpp b/ACE/ace/LSOCK_Dgram.cpp
index d544d4d3850..5d19eb56f94 100644
--- a/ACE/ace/LSOCK_Dgram.cpp
+++ b/ACE/ace/LSOCK_Dgram.cpp
@@ -6,8 +6,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/LSOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/LSOCK_Stream.cpp b/ACE/ace/LSOCK_Stream.cpp
index 4af5927f1c3..fa2e0c48a37 100644
--- a/ACE/ace/LSOCK_Stream.cpp
+++ b/ACE/ace/LSOCK_Stream.cpp
@@ -7,8 +7,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/LSOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp
index 1ffc040ece9..ea7814a7e4f 100644
--- a/ACE/ace/Lib_Find.cpp
+++ b/ACE/ace/Lib_Find.cpp
@@ -53,7 +53,6 @@ extern "C" int LIB$FIND_IMAGE_SYMBOL(...);
 class ACE_LD_Symbol_Registry
 {
 public:
-
   typedef ACE_RB_Tree<const ACE_TCHAR*,
                       void*,
                       ACE_Less_Than<const ACE_TCHAR*>,
@@ -64,9 +63,9 @@ public:
 
   void* find_symbol (const ACE_TCHAR* symname);
 
-  ACE_LD_Symbol_Registry () {}
-private:
+  ACE_LD_Symbol_Registry () = default;
 
+private:
   TREE symbol_registry_;
 };
 
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index 1a8aaac0ad1..b0fa98ad2e5 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -10,7 +10,6 @@
 #include "ace/Local_Tokens.inl"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
@@ -36,10 +35,6 @@ ACE_Tokens::ACE_Tokens (void)
   ACE_TRACE ("ACE_Tokens::ACE_Tokens");
 }
 
-ACE_Tokens::~ACE_Tokens (void)
-{
-}
-
 void
 ACE_Tokens::make_owner (ACE_TPQ_Entry *caller)
 {
diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h
index 61a366375ae..c420cf92e9e 100644
--- a/ACE/ace/Local_Tokens.h
+++ b/ACE/ace/Local_Tokens.h
@@ -266,7 +266,7 @@ public:
   ACE_TPQ_Iterator (ACE_Token_Proxy_Queue &q);
 
   /// Destructor.
-  ~ACE_TPQ_Iterator (void);
+  ~ACE_TPQ_Iterator () = default;
 
   /// Pass back the @a next_item.
   int next (ACE_TPQ_Entry *&next_item);
@@ -308,7 +308,7 @@ public:
   ACE_Token_Proxy_Queue (void);
 
   /// Destructor.
-  ~ACE_Token_Proxy_Queue (void);
+  ~ACE_Token_Proxy_Queue () = default;
 
   /**
    * Enqueue a proxy, nesting level, client_id, and a magic cookie at
@@ -369,12 +369,11 @@ protected:
 class ACE_Export ACE_Tokens
 {
 public:
-
   /// Null constructor.
-  ACE_Tokens (void);
+  ACE_Tokens ();
 
   /// Destructor
-  virtual ~ACE_Tokens (void);
+  virtual ~ACE_Tokens () = default;
 
   /// No implementation.
   virtual int acquire (ACE_TPQ_Entry *caller,
@@ -461,7 +460,6 @@ public:
   ACE_TPQ_Entry *owner (void);
 
 protected:
-
   /// For the deadlock detection algorithm.
   int visited_;
 
@@ -1088,16 +1086,16 @@ public:
                    int debug = 0);
 
   /// Destructor
-  ~ACE_Local_WLock (void);
+  ~ACE_Local_WLock ();
 
   /// Dump the state of the class.
   void dump () const;
 
   /// Returns ACE_RW_Token::WLOCK.
-  virtual int type (void) const;
+  virtual int type () const;
 
   /// Return deep copy.
-  virtual ACE_Token_Proxy *clone (void) const;
+  virtual ACE_Token_Proxy *clone () const;
 
 protected:
   /// Return a new ACE_Local_Mutex.
diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl
index 23dc5d86796..a57ca96344b 100644
--- a/ACE/ace/Local_Tokens.inl
+++ b/ACE/ace/Local_Tokens.inl
@@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // ************************************************************
 
 ACE_INLINE int
-ACE_Token_Proxy_Queue::size (void)
+ACE_Token_Proxy_Queue::size ()
 {
   ACE_TRACE ("ACE_Token_Proxy_Queue::size");
   return this->size_;
@@ -15,7 +15,7 @@ ACE_Token_Proxy_Queue::size (void)
 // ************************************************************
 
 ACE_INLINE int
-ACE_TPQ_Entry::waiting (void) const
+ACE_TPQ_Entry::waiting () const
 {
   ACE_TRACE ("ACE_TPQ_Entry::waiting");
   return waiting_;
@@ -29,14 +29,14 @@ ACE_TPQ_Entry::waiting (int v)
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_TPQ_Entry::client_id (void) const
+ACE_TPQ_Entry::client_id () const
 {
   ACE_TRACE ("ACE_TPQ_Entry::client_id");
   return this->client_id_;
 }
 
 ACE_INLINE ACE_Token_Proxy *
-ACE_TPQ_Entry::proxy (void) const
+ACE_TPQ_Entry::proxy () const
 {
   ACE_TRACE ("ACE_TPQ_Entry::proxy");
   return this->proxy_;
@@ -49,16 +49,6 @@ ACE_TPQ_Entry::proxy (ACE_Token_Proxy *proxy)
   this->proxy_ = proxy;
 }
 
-ACE_INLINE
-ACE_TPQ_Iterator::~ACE_TPQ_Iterator (void)
-{
-}
-
-ACE_INLINE
-ACE_Token_Proxy_Queue::~ACE_Token_Proxy_Queue (void)
-{
-}
-
 ACE_INLINE void
 ACE_Tokens::remove (ACE_TPQ_Entry *caller)
 {
@@ -96,8 +86,6 @@ ACE_Token_Proxy_Queue::head (void)
 }
 
 // **************************************************
-// **************************************************
-// **************************************************
 
 ACE_INLINE void
 ACE_Tokens::visit (int v)
@@ -140,7 +128,7 @@ ACE_Tokens::name (void)
 // ************************************************************
 
 ACE_INLINE int
-ACE_TPQ_Entry::nesting_level (void) const
+ACE_TPQ_Entry::nesting_level () const
 {
   ACE_TRACE ("ACE_TPQ_Entry::nesting_level");
   return this->nesting_level_;
@@ -154,7 +142,7 @@ ACE_TPQ_Entry::nesting_level (int delta)
 }
 
 ACE_INLINE ACE_TPQ_Entry::PTVF
-ACE_TPQ_Entry::sleep_hook (void) const
+ACE_TPQ_Entry::sleep_hook () const
 {
   ACE_TRACE ("ACE_TPQ_Entry::sleep_hook");
   return this->sleep_hook_;
@@ -188,8 +176,6 @@ ACE_TPQ_Entry::equal_client_id (const ACE_TCHAR *id)
 }
 
 // ************************************************************
-// ************************************************************
-// ************************************************************
 
 ACE_INLINE
 ACE_Local_Mutex::ACE_Local_Mutex (const ACE_TCHAR *token_name,
@@ -252,10 +238,10 @@ ACE_INLINE void
 ACE_Token_Name::operator= (const ACE_Token_Name &rhs)
 {
   ACE_TRACE ("ACE_Token_Name::operator=");
-  if (&rhs == this)
-    return;
-  else
+  if (&rhs != this)
+  {
     this->name (rhs.name ());
+  }
 }
 
 ACE_INLINE bool
diff --git a/ACE/ace/Lock.cpp b/ACE/ace/Lock.cpp
index b3b78a4729a..9b89681f1ee 100644
--- a/ACE/ace/Lock.cpp
+++ b/ACE/ace/Lock.cpp
@@ -4,8 +4,6 @@
 #include "ace/Lock.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Lock::~ACE_Lock ()
diff --git a/ACE/ace/Lock.h b/ACE/ace/Lock.h
index 2216a6f5581..c68a156feb1 100644
--- a/ACE/ace/Lock.h
+++ b/ACE/ace/Lock.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Lock.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h
index ece637ae264..360f2d02479 100644
--- a/ACE/ace/Lock_Adapter_T.h
+++ b/ACE/ace/Lock_Adapter_T.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Lock_Adapter_T.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 474962401a3..a40750264a4 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -928,14 +928,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # define ACE_TSS_CLEANUP_NAME ACE_TSS_cleanup
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
-
 LOCAL_EXTERN_PREFIX
 void
 ACE_TSS_CLEANUP_NAME (void *ptr);
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
 #endif /* ACE_MT_SAFE */
 
-
 #if defined (__ACE_INLINE__)
 #include "ace/Log_Msg.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index 56fd98df942..e484ef91451 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -3,8 +3,6 @@
 #include "ace/CDR_Stream.h"
 #include "ace/Truncate.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Log_Msg_IPC::ACE_Log_Msg_IPC ()
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp
index f9d0d141deb..29a8cd05afa 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp
@@ -8,8 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Log_Msg_NT_Event_Log::ACE_Log_Msg_NT_Event_Log (void)
diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp
index 27bc04ab4d0..10afe145c1c 100644
--- a/ACE/ace/MEM_Acceptor.cpp
+++ b/ACE/ace/MEM_Acceptor.cpp
@@ -12,8 +12,6 @@
 #include "ace/MEM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor)
diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp
index 1a27b9a72d8..46750e0d864 100644
--- a/ACE/ace/MEM_IO.cpp
+++ b/ACE/ace/MEM_IO.cpp
@@ -8,8 +8,6 @@
 #include "ace/MEM_IO.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_IO)
diff --git a/ACE/ace/MEM_SAP.cpp b/ACE/ace/MEM_SAP.cpp
index 26a85a07292..6269849cc23 100644
--- a/ACE/ace/MEM_SAP.cpp
+++ b/ACE/ace/MEM_SAP.cpp
@@ -6,8 +6,6 @@
 #include "ace/MEM_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_SAP)
diff --git a/ACE/ace/MEM_Stream.cpp b/ACE/ace/MEM_Stream.cpp
index 2af690115d6..ddfdaa40095 100644
--- a/ACE/ace/MEM_Stream.cpp
+++ b/ACE/ace/MEM_Stream.cpp
@@ -6,8 +6,6 @@
 #include "ace/MEM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream)
diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h
index 7021586e26c..e90264d0e14 100644
--- a/ACE/ace/MMAP_Memory_Pool.h
+++ b/ACE/ace/MMAP_Memory_Pool.h
@@ -120,9 +120,8 @@ public:
   bool install_signal_handler_;
 
 private:
-  // Prevent copying
-  ACE_MMAP_Memory_Pool_Options (const ACE_MMAP_Memory_Pool_Options &);
-  ACE_MMAP_Memory_Pool_Options &operator= (const ACE_MMAP_Memory_Pool_Options &);
+  ACE_MMAP_Memory_Pool_Options (const ACE_MMAP_Memory_Pool_Options &) = delete;
+  ACE_MMAP_Memory_Pool_Options &operator= (const ACE_MMAP_Memory_Pool_Options &) = delete;
 };
 
 /**
diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp
index 77023adeb43..4f1cae29388 100644
--- a/ACE/ace/Malloc.cpp
+++ b/ACE/ace/Malloc.cpp
@@ -8,7 +8,6 @@
 #include "ace/Malloc_Base.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Process-wide ACE_Allocator.
diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h
index 76e63076bd6..c73f984e856 100644
--- a/ACE/ace/Malloc_Base.h
+++ b/ACE/ace/Malloc_Base.h
@@ -178,7 +178,7 @@ public:
   typedef std::ptrdiff_t difference_type;
   template <typename U> struct rebind { typedef ACE_Allocator_Std_Adapter<U> other; };
 
-  ACE_Allocator_Std_Adapter() {}
+  ACE_Allocator_Std_Adapter() = default;
 
   template <typename U>
   ACE_Allocator_Std_Adapter(const ACE_Allocator_Std_Adapter<U>&) {}
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp
index b2d117f045c..a2cd42f0d2a 100644
--- a/ACE/ace/Malloc_T.cpp
+++ b/ACE/ace/Malloc_T.cpp
@@ -14,7 +14,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T, class ACE_LOCK>
diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h
index a2981f41ffd..757d8564e66 100644
--- a/ACE/ace/Manual_Event.h
+++ b/ACE/ace/Manual_Event.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Manual_Event.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -85,7 +83,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  virtual ~ACE_Manual_Event () {}
+  ~ACE_Manual_Event () override = default;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index 27b6b24fcc0..80e2a3a62c6 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -145,15 +145,15 @@ public:
   typedef ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> reverse_iterator;
 
   /// Initialize a ACE_Map_Manager with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Map_Manager (ACE_Allocator *alloc = 0);
+  ACE_Map_Manager (ACE_Allocator *alloc = nullptr);
 
   /// Initialize a ACE_Map_Manager with @a size entries.
   ACE_Map_Manager (size_t size,
-                   ACE_Allocator *alloc = 0);
+                   ACE_Allocator *alloc = nullptr);
 
   /// Initialize a ACE_Map_Manager with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-            ACE_Allocator *alloc = 0);
+            ACE_Allocator *alloc = nullptr);
 
   /// Close down a ACE_Map_Manager and release dynamically allocated
   /// resources.
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h
index 51e89febc08..876dda9ce03 100644
--- a/ACE/ace/Map_T.h
+++ b/ACE/ace/Map_T.h
@@ -283,7 +283,7 @@ public:
 
   /// Initialize a map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-                    ACE_Allocator *alloc = 0) = 0;
+                    ACE_Allocator *alloc = nullptr) = 0;
 
   /// Close down a <Map> and release dynamically allocated resources.
   virtual int close () = 0;
@@ -554,19 +554,19 @@ public:
           implementation;
 
   /// Initialize with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Map_Impl (ACE_Allocator *alloc = 0);
+  ACE_Map_Impl (ACE_Allocator *alloc = nullptr);
 
   /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Map_Impl (size_t size,
-                ACE_Allocator *alloc = 0);
+                ACE_Allocator *alloc = nullptr);
 
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Map_Impl ();
 
   /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-                    ACE_Allocator *alloc = 0);
+                    ACE_Allocator *alloc = nullptr);
 
   /// Close down a <Map> and release dynamically allocated resources.
   virtual int close ();
@@ -833,19 +833,19 @@ public:
           implementation;
 
   /// Initialize with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
+  ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = nullptr);
 
   /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Active_Map_Manager_Adapter (size_t size,
-                                  ACE_Allocator *alloc = 0);
+                                  ACE_Allocator *alloc = nullptr);
 
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Active_Map_Manager_Adapter ();
 
   /// Initialize a Map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-                    ACE_Allocator *alloc = 0);
+                    ACE_Allocator *alloc = nullptr);
 
   /// Close down a Map and release dynamically allocated resources.
   virtual int close ();
@@ -1123,19 +1123,19 @@ public:
           implementation;
 
   /// Initialize with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0);
+  ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = nullptr);
 
   /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Hash_Map_Manager_Ex_Adapter (size_t size,
-                                   ACE_Allocator *alloc = 0);
+                                   ACE_Allocator *alloc = nullptr);
 
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Hash_Map_Manager_Ex_Adapter ();
 
   /// Initialize a Map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-                    ACE_Allocator *alloc = 0);
+                    ACE_Allocator *alloc = nullptr);
 
   /// Close down a Map and release dynamically allocated resources.
   virtual int close ();
@@ -1406,19 +1406,19 @@ public:
           implementation;
 
   /// Initialize with the ACE_DEFAULT_MAP_SIZE.
-  ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
+  ACE_Map_Manager_Adapter (ACE_Allocator *alloc = nullptr);
 
   /// Initialize with @a size entries.  The @a size parameter is ignored
   /// by maps for which an initialize size does not make sense.
   ACE_Map_Manager_Adapter (size_t size,
-                           ACE_Allocator *alloc = 0);
+                           ACE_Allocator *alloc = nullptr);
 
   /// Close down and release dynamically allocated resources.
   virtual ~ACE_Map_Manager_Adapter ();
 
   /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-                    ACE_Allocator *alloc = 0);
+                    ACE_Allocator *alloc = nullptr);
 
   /// Close down a <Map> and release dynamically allocated resources.
   virtual int close ();
diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h
index 6fea82734a4..2e50483b67d 100644
--- a/ACE/ace/Message_Queue_NT.h
+++ b/ACE/ace/Message_Queue_NT.h
@@ -58,10 +58,10 @@ public:
 
   /// Close down the underlying I/O completion port.  You need to
   /// re-open the MQ after this function is executed.
-  virtual int close (void);
+  virtual int close ();
 
   /// Close down the message queue and release all resources.
-  virtual ~ACE_Message_Queue_NT (void);
+  virtual ~ACE_Message_Queue_NT ();
 
   // = Enqueue and dequeue methods.
 
@@ -90,30 +90,30 @@ public:
    * Always return false.
    */
 
-  virtual bool is_full (void);
+  virtual bool is_full ();
   /**
    * True if queue is empty, else false.  Notice the return value is
    * only transient.
    */
-  virtual bool is_empty (void);
+  virtual bool is_empty ();
 
   // = Queue statistic methods (transient.)
   /**
    * Number of total bytes on the queue, i.e., sum of the message
    * block sizes.
    */
-  virtual size_t message_bytes (void);
+  virtual size_t message_bytes ();
 
   /**
    * Number of total length on the queue, i.e., sum of the message
    * block lengths.
    */
-  virtual size_t message_length (void);
+  virtual size_t message_length ();
 
   /**
    * Number of total messages on the queue.
    */
-  virtual size_t message_count (void);
+  virtual size_t message_count ();
 
   // = Manual changes to these stats (used when queued message blocks
   // change size or lengths).
@@ -130,7 +130,7 @@ public:
   virtual void message_length (size_t new_length);
 
   /// Get the max concurrent thread number.
-  virtual DWORD max_threads (void);
+  virtual DWORD max_threads ();
 
   // = Activation control methods.
 
@@ -143,13 +143,13 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int deactivate (void);
+  virtual int deactivate ();
 
   /**
    * Reactivate the queue so that threads can enqueue and dequeue
    * messages again.  Returns the state of the queue before the call.
    */
-  virtual int activate (void);
+  virtual int activate ();
 
   /**
    * Pulse the queue to wake up any waiting threads.  Changes the
@@ -158,11 +158,11 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int pulse (void);
+  virtual int pulse ();
 
   /// Returns true if the state of the queue is <DEACTIVATED>,
   /// but false if the queue's is <ACTIVATED> or <PULSED>.
-  virtual int deactivated (void);
+  virtual int deactivated ();
 
   // = Not currently implemented...
   int peek_dequeue_head (ACE_Message_Block *&first_item,
@@ -176,7 +176,7 @@ public:
   virtual void dump () const;
 
   /// Get the handle to the underlying completion port.
-  virtual ACE_HANDLE completion_port (void);
+  virtual ACE_HANDLE completion_port ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp
index b17c85c131f..c2611b921d3 100644
--- a/ACE/ace/Metrics_Cache_T.cpp
+++ b/ACE/ace/Metrics_Cache_T.cpp
@@ -1,8 +1,6 @@
 #ifndef ACE_METRICS_CACHE_CPP
 #define ACE_METRICS_CACHE_CPP
 
-//#define ACE_BUILD_DLL
-
 #include "ace/Metrics_Cache_T.h"
 
 #if defined (ACE_COMPILE_TIMEPROBES)
diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h
index 037ae3bee81..d851c008e49 100644
--- a/ACE/ace/Metrics_Cache_T.h
+++ b/ACE/ace/Metrics_Cache_T.h
@@ -213,7 +213,6 @@ protected:
   int metrics_enabled_;
 
 private:
-
   /// Allocation strategy object.
   ALLOCATOR* allocator_;
 
diff --git a/ACE/ace/Monitor_Control/Constraint_Visitor.cpp b/ACE/ace/Monitor_Control/Constraint_Visitor.cpp
index 6c844a12147..786ffe5ee72 100644
--- a/ACE/ace/Monitor_Control/Constraint_Visitor.cpp
+++ b/ACE/ace/Monitor_Control/Constraint_Visitor.cpp
@@ -18,9 +18,6 @@ namespace ACE
       : data_ (data)
     {}
 
-    Constraint_Visitor::~Constraint_Visitor (void)
-    {}
-
     ACE_CDR::Boolean
     Constraint_Visitor::evaluate_constraint (ETCL_Constraint *root)
     {
diff --git a/ACE/ace/Monitor_Control/Constraint_Visitor.h b/ACE/ace/Monitor_Control/Constraint_Visitor.h
index 6278ad50ffa..784a0e8b514 100644
--- a/ACE/ace/Monitor_Control/Constraint_Visitor.h
+++ b/ACE/ace/Monitor_Control/Constraint_Visitor.h
@@ -52,14 +52,14 @@ namespace ACE
     {
     public:
       Constraint_Visitor (const Monitor_Control_Types::Data& data);
-      virtual ~Constraint_Visitor (void);
+      ~Constraint_Visitor () override = default;
 
       ACE_CDR::Boolean evaluate_constraint (ETCL_Constraint *root);
 
-      virtual int visit_literal (ETCL_Literal_Constraint *);
-      virtual int visit_identifier (ETCL_Identifier *);
-      virtual int visit_unary_expr (ETCL_Unary_Expr *);
-      virtual int visit_binary_expr (ETCL_Binary_Expr *);
+      int visit_literal (ETCL_Literal_Constraint *) override;
+      int visit_identifier (ETCL_Identifier *) override;
+      int visit_unary_expr (ETCL_Unary_Expr *) override;
+      int visit_binary_expr (ETCL_Binary_Expr *) override;
 
     private:
       /// Sub-methods for visit_binary_expr().
diff --git a/ACE/ace/Monitor_Control_Action.cpp b/ACE/ace/Monitor_Control_Action.cpp
index 1eb9c1324ea..995c365dbf2 100644
--- a/ACE/ace/Monitor_Control_Action.cpp
+++ b/ACE/ace/Monitor_Control_Action.cpp
@@ -14,9 +14,6 @@ namespace ACE
       : ACE_Refcountable_T<ACE_SYNCH_MUTEX> (1)
     {}
 
-    Control_Action::~Control_Action ()
-    {}
-
     void
     Control_Action::add_ref ()
     {
diff --git a/ACE/ace/Monitor_Control_Action.h b/ACE/ace/Monitor_Control_Action.h
index f25e57bf379..aea10b43b46 100644
--- a/ACE/ace/Monitor_Control_Action.h
+++ b/ACE/ace/Monitor_Control_Action.h
@@ -48,8 +48,8 @@ namespace ACE
       void remove_ref (void);
 
     protected:
-      Control_Action (void);
-      virtual ~Control_Action (void);
+      Control_Action ();
+      ~Control_Action () override = default;
     };
   }
 }
diff --git a/ACE/ace/Monitor_Size.cpp b/ACE/ace/Monitor_Size.cpp
index d314c72f60b..fc5abba7608 100644
--- a/ACE/ace/Monitor_Size.cpp
+++ b/ACE/ace/Monitor_Size.cpp
@@ -20,10 +20,6 @@ namespace ACE
     {
     }
 
-    Size_Monitor::~Size_Monitor ()
-    {
-    }
-
     void
     Size_Monitor::update ()
     {
diff --git a/ACE/ace/Monitor_Size.h b/ACE/ace/Monitor_Size.h
index 72b14e0d451..0ecf46533e6 100644
--- a/ACE/ace/Monitor_Size.h
+++ b/ACE/ace/Monitor_Size.h
@@ -41,14 +41,14 @@ namespace ACE
     public:
       Size_Monitor ();
       Size_Monitor (const char* name);
-      virtual ~Size_Monitor ();
+      ~Size_Monitor () override = default;
 
       /// Implemented by the most-derived class. Does the actual
       /// work of fetching the monitored value.
-      virtual void update ();
+      void update () override;
 
       /// Reset function.
-      virtual void clear ();
+      void clear () override;
     };
   }
 }
diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp
index 7852dceade3..b4488bb6e7d 100644
--- a/ACE/ace/Msg_WFMO_Reactor.cpp
+++ b/ACE/ace/Msg_WFMO_Reactor.cpp
@@ -1,7 +1,5 @@
 #include "ace/Msg_WFMO_Reactor.h"
 
-
-
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h
index 2f371a772a5..ba784f63b7f 100644
--- a/ACE/ace/Mutex.h
+++ b/ACE/ace/Mutex.h
@@ -190,9 +190,8 @@ public:
   bool removed_;
 
 private:
-  // Prevent assignment and initialization.
-  ACE_Mutex &operator= (const ACE_Mutex &);
-  ACE_Mutex (const ACE_Mutex &);
+  ACE_Mutex &operator= (const ACE_Mutex &) = delete;
+  ACE_Mutex (const ACE_Mutex &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Name_Proxy.h b/ACE/ace/Name_Proxy.h
index 0132dfe6f8e..7152cd76f96 100644
--- a/ACE/ace/Name_Proxy.h
+++ b/ACE/ace/Name_Proxy.h
@@ -76,7 +76,6 @@ public:
   void dump () const;
 
 private:
-
   /// ACE_Connector factory used to establish connections actively.
   ACE_SOCK_Connector connector_;
 
@@ -87,9 +86,8 @@ private:
   ACE_Reactor *reactor_;
 
 private:
-  // Prevent copying
-  ACE_Name_Proxy (const ACE_Name_Proxy &);
-  ACE_Name_Proxy &operator= (const ACE_Name_Proxy &);
+  ACE_Name_Proxy (const ACE_Name_Proxy &) = delete;
+  ACE_Name_Proxy &operator= (const ACE_Name_Proxy &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index 46b6ebd975a..d5acc969031 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -13,8 +13,6 @@
 # include "ace/Trace.h"
 #endif /* ACE_HAS_TRACE */
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Naming_Context.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h
index c204d628b66..2d934b14086 100644
--- a/ACE/ace/Netlink_Addr.h
+++ b/ACE/ace/Netlink_Addr.h
@@ -46,7 +46,7 @@ public:
   ACE_Netlink_Addr (const sockaddr_nl *, int len);
 
   /// Dtor
-  ~ACE_Netlink_Addr (void);
+  ~ACE_Netlink_Addr () = default;
 
   /**
    * @param naddr sets the nl_ member @see nl_
diff --git a/ACE/ace/Netlink_Addr.inl b/ACE/ace/Netlink_Addr.inl
index 912f21cd834..06c31b65d17 100644
--- a/ACE/ace/Netlink_Addr.inl
+++ b/ACE/ace/Netlink_Addr.inl
@@ -3,8 +3,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE ACE_Netlink_Addr::~ACE_Netlink_Addr (void){}
-
 ACE_INLINE ACE_Netlink_Addr::ACE_Netlink_Addr (void):
 ACE_Addr (this->determine_type(), sizeof (sockaddr_nl))
 {
diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h
index c1147907f4e..fc4ec18c576 100644
--- a/ACE/ace/Null_Barrier.h
+++ b/ACE/ace/Null_Barrier.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Null_Barrier.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -30,7 +28,7 @@ public:
                     void * = 0) {};
 
   /// Default dtor.
-  ~ACE_Null_Barrier () {};
+  ~ACE_Null_Barrier () = default;
 
   /// Block the caller until all <count> threads have called <wait> and
   /// then allow all the caller threads to continue in parallel.
@@ -43,9 +41,8 @@ public:
   //ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Null_Barrier &);
-  ACE_Null_Barrier (const ACE_Null_Barrier &);
+  void operator= (const ACE_Null_Barrier &) = delete;
+  ACE_Null_Barrier (const ACE_Null_Barrier &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h
index bf4d4313a4e..db68b6c0e0a 100644
--- a/ACE/ace/Null_Condition.h
+++ b/ACE/ace/Null_Condition.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Null_Condition.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -49,7 +47,7 @@ public:
                  void * = 0)
   : mutex_ ((ACE_Null_Mutex &) m) {}
 
-  ~ACE_Condition () {}
+  ~ACE_Condition () = default;
 
   /// Returns 0.
   int remove () {return 0;}
@@ -78,9 +76,8 @@ protected:
   ACE_Null_Mutex &mutex_; // Reference to mutex lock.
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition<ACE_Null_Mutex> &);
-  ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &);
+  void operator= (const ACE_Condition<ACE_Null_Mutex> &) = delete;
+  ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &) = delete;
 };
 
 typedef ACE_Condition<ACE_Null_Mutex> ACE_Null_Condition;
diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h
index 63d449ecd1e..86999a0f18c 100644
--- a/ACE/ace/Null_Mutex.h
+++ b/ACE/ace/Null_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Null_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -38,7 +36,7 @@ class ACE_Export ACE_Null_Mutex
 public:
   ACE_Null_Mutex (const ACE_TCHAR * = 0)
     : lock_ (0) {}
-  ~ACE_Null_Mutex () {}
+  ~ACE_Null_Mutex () = default;
   /// Return 0.
   int remove () {return 0;}
 
@@ -103,7 +101,7 @@ public:
   ACE_Guard (ACE_Null_Mutex &, int) {}
   ACE_Guard (ACE_Null_Mutex &, int, int) {}
 #if defined (ACE_WIN32)
-  ~ACE_Guard (void) {}
+  ~ACE_Guard () = default;
 #endif /* ACE_WIN32 */
 
   int acquire () { return 0; }
diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h
index 8656098ead9..1e3e4dac0bb 100644
--- a/ACE/ace/Null_Semaphore.h
+++ b/ACE/ace/Null_Semaphore.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Null_Semaphore.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -51,7 +49,7 @@ public:
                        const ACE_TCHAR * = 0,
                        void * = 0,
                        int = 0x7fffffff) {}
-  ~ACE_Null_Semaphore () {}
+  ~ACE_Null_Semaphore () = default;
   /// Return 0.
   int remove () {return 0;}
 
diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h
index 0f888f8ca62..9b6f05cad30 100644
--- a/ACE/ace/Numeric_Limits.h
+++ b/ACE/ace/Numeric_Limits.h
@@ -60,8 +60,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <typename T>
 struct ACE_Numeric_Limits
 {
-  static T min () { return std::numeric_limits<T>::min (); }
-  static T max () { return std::numeric_limits<T>::max (); }
+  static constexpr T min () { return std::numeric_limits<T>::min (); }
+  static constexpr T max () { return std::numeric_limits<T>::max (); }
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h
index de7d8420a4c..d50463c9b68 100644
--- a/ACE/ace/OS_Errno.h
+++ b/ACE/ace/OS_Errno.h
@@ -4,7 +4,7 @@
 /**
  *  @file   OS_Errno.h
  *
- *  @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu>
+ *  @author Doug Schmidt <d.schmidt@vanderbilt.edu>
  */
 //=============================================================================
 
@@ -70,9 +70,8 @@ public:
   bool operator!= (int error);
 
 private:
-  // Prevent copying
-  ACE_Errno_Guard (const ACE_Errno_Guard &);
-  ACE_Errno_Guard &operator= (const ACE_Errno_Guard &);
+  ACE_Errno_Guard (const ACE_Errno_Guard &) = delete;
+  ACE_Errno_Guard &operator= (const ACE_Errno_Guard &) = delete;
 
 #if defined (ACE_MT_SAFE)
   ACE_ERRNO_TYPE *errno_ptr_;
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 9419f1d0812..5a1da97c9df 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
@@ -2030,9 +2028,8 @@ protected:
   /// Keeps track of whether we acquired the lock or failed.
   int owner_;
 
-  // = Prevent assignment and initialization.
-  ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &);
-  ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &);
+  ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &) = delete;
+  ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &) = delete;
 };
 
 /**
@@ -2075,11 +2072,8 @@ protected:
   /// Keeps track of whether we acquired the lock or failed.
   int owner_;
 
-  // = Prevent assignment and initialization.
-  ACE_OS_Recursive_Thread_Mutex_Guard &operator= (
-    const ACE_OS_Recursive_Thread_Mutex_Guard &);
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    const ACE_OS_Recursive_Thread_Mutex_Guard &);
+  ACE_OS_Recursive_Thread_Mutex_Guard &operator= (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete;
+  ACE_OS_Recursive_Thread_Mutex_Guard (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_arpa_inet.h b/ACE/ace/OS_NS_arpa_inet.h
index caf7eb6c4bc..f33340376f6 100644
--- a/ACE/ace/OS_NS_arpa_inet.h
+++ b/ACE/ace/OS_NS_arpa_inet.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_ctype.h b/ACE/ace/OS_NS_ctype.h
index 702b9127a15..2bff7a3c3ad 100644
--- a/ACE/ace/OS_NS_ctype.h
+++ b/ACE/ace/OS_NS_ctype.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h
index 562018d0390..d426e8a61a2 100644
--- a/ACE/ace/OS_NS_dirent.h
+++ b/ACE/ace/OS_NS_dirent.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h
index f21e7dd20fb..733d8f7f2b4 100644
--- a/ACE/ace/OS_NS_dlfcn.h
+++ b/ACE/ace/OS_NS_dlfcn.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h
index 407f68a2ee0..722241d7662 100644
--- a/ACE/ace/OS_NS_errno.h
+++ b/ACE/ace/OS_NS_errno.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
@@ -66,7 +64,7 @@ namespace ACE_OS {
 class ACE_Export ACE_CE_Errno
 {
 public:
-  ACE_CE_Errno () {}
+  ACE_CE_Errno () = default;
   static void init ();
   static void fini ();
   static ACE_CE_Errno *instance ();
diff --git a/ACE/ace/OS_NS_fcntl.h b/ACE/ace/OS_NS_fcntl.h
index 3fd7d07482a..e95b50aa213 100644
--- a/ACE/ace/OS_NS_fcntl.h
+++ b/ACE/ace/OS_NS_fcntl.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h
index 8f94cdad952..0714f574f7c 100644
--- a/ACE/ace/OS_NS_macros.h
+++ b/ACE/ace/OS_NS_macros.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h
index 2072851f7f6..9bbb0dbc369 100644
--- a/ACE/ace/OS_NS_math.h
+++ b/ACE/ace/OS_NS_math.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h
index 5885e178900..d08d2711d30 100644
--- a/ACE/ace/OS_NS_netdb.h
+++ b/ACE/ace/OS_NS_netdb.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_poll.h b/ACE/ace/OS_NS_poll.h
index f865f51bd7c..a4f21d62f49 100644
--- a/ACE/ace/OS_NS_poll.h
+++ b/ACE/ace/OS_NS_poll.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_pwd.h b/ACE/ace/OS_NS_pwd.h
index 86b91883639..169aee46cd8 100644
--- a/ACE/ace/OS_NS_pwd.h
+++ b/ACE/ace/OS_NS_pwd.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_regex.h b/ACE/ace/OS_NS_regex.h
index 8851abe4944..cffd6c94361 100644
--- a/ACE/ace/OS_NS_regex.h
+++ b/ACE/ace/OS_NS_regex.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h
index 8cf09884e43..fc0b8101aee 100644
--- a/ACE/ace/OS_NS_signal.h
+++ b/ACE/ace/OS_NS_signal.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 68a7b56a0cd..1c4046f73a9 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index 4e0e4442eeb..ab0f86884b1 100644
--- a/ACE/ace/OS_NS_stdlib.h
+++ b/ACE/ace/OS_NS_stdlib.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h
index 7d98895b8ac..1bd15501d89 100644
--- a/ACE/ace/OS_NS_string.h
+++ b/ACE/ace/OS_NS_string.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_strings.h b/ACE/ace/OS_NS_strings.h
index 37d2befa570..5da352220ba 100644
--- a/ACE/ace/OS_NS_strings.h
+++ b/ACE/ace/OS_NS_strings.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h
index 3ec7a76c64f..7b48d769b78 100644
--- a/ACE/ace/OS_NS_stropts.h
+++ b/ACE/ace/OS_NS_stropts.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_mman.h b/ACE/ace/OS_NS_sys_mman.h
index 3d976aeaaa1..ffcd4df547c 100644
--- a/ACE/ace/OS_NS_sys_mman.h
+++ b/ACE/ace/OS_NS_sys_mman.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_msg.h b/ACE/ace/OS_NS_sys_msg.h
index 2af245d9a43..aabf25768c2 100644
--- a/ACE/ace/OS_NS_sys_msg.h
+++ b/ACE/ace/OS_NS_sys_msg.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_resource.h b/ACE/ace/OS_NS_sys_resource.h
index 90d85c56fc1..9b4fbc999e1 100644
--- a/ACE/ace/OS_NS_sys_resource.h
+++ b/ACE/ace/OS_NS_sys_resource.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_select.h b/ACE/ace/OS_NS_sys_select.h
index 363c64b8f48..807cdbab7f7 100644
--- a/ACE/ace/OS_NS_sys_select.h
+++ b/ACE/ace/OS_NS_sys_select.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_shm.h b/ACE/ace/OS_NS_sys_shm.h
index d7597ca9f9c..5ad517b49e9 100644
--- a/ACE/ace/OS_NS_sys_shm.h
+++ b/ACE/ace/OS_NS_sys_shm.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h
index 757a3bb1cd1..27218a44dd9 100644
--- a/ACE/ace/OS_NS_sys_socket.h
+++ b/ACE/ace/OS_NS_sys_socket.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h
index 06a0862234a..c8b7bb290f6 100644
--- a/ACE/ace/OS_NS_sys_stat.h
+++ b/ACE/ace/OS_NS_sys_stat.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_time.h b/ACE/ace/OS_NS_sys_time.h
index f873d1044e7..d8154e23b15 100644
--- a/ACE/ace/OS_NS_sys_time.h
+++ b/ACE/ace/OS_NS_sys_time.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_uio.h b/ACE/ace/OS_NS_sys_uio.h
index e03894b3007..ece317202be 100644
--- a/ACE/ace/OS_NS_sys_uio.h
+++ b/ACE/ace/OS_NS_sys_uio.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_utsname.h b/ACE/ace/OS_NS_sys_utsname.h
index 2851122ec0b..6c9a71efa9b 100644
--- a/ACE/ace/OS_NS_sys_utsname.h
+++ b/ACE/ace/OS_NS_sys_utsname.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_sys_wait.h b/ACE/ace/OS_NS_sys_wait.h
index 58a7d01187a..dc9f1eafbd7 100644
--- a/ACE/ace/OS_NS_sys_wait.h
+++ b/ACE/ace/OS_NS_sys_wait.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index a6c1f40dc21..4e204c63b7b 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h
index 091cc708452..6686583efa3 100644
--- a/ACE/ace/OS_NS_unistd.h
+++ b/ACE/ace/OS_NS_unistd.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h
index 5b42e80b2ae..6fa8c15197e 100644
--- a/ACE/ace/OS_NS_wchar.h
+++ b/ACE/ace/OS_NS_wchar.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 5a15bac6a27..5f90e56b2c2 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/Obchunk.cpp b/ACE/ace/Obchunk.cpp
index bcfc5c09a5f..db6ee4b94fe 100644
--- a/ACE/ace/Obchunk.cpp
+++ b/ACE/ace/Obchunk.cpp
@@ -3,10 +3,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Obchunk.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk)
diff --git a/ACE/ace/Obchunk.h b/ACE/ace/Obchunk.h
index 4ab76f8a3e8..87f0f258399 100644
--- a/ACE/ace/Obchunk.h
+++ b/ACE/ace/Obchunk.h
@@ -36,7 +36,7 @@ public:
   ACE_Obchunk (size_t size);
 
   /// Dtor.
-  ~ACE_Obchunk ();
+  ~ACE_Obchunk () = default;
 
   /// Dump the state of an object.
   void dump () const;
@@ -66,9 +66,5 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-#include "ace/Obchunk.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OBCHUNK_H */
diff --git a/ACE/ace/Obchunk.inl b/ACE/ace/Obchunk.inl
deleted file mode 100644
index cb5b68ccef6..00000000000
--- a/ACE/ace/Obchunk.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_Obchunk::~ACE_Obchunk ()
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index a1758e0a616..619311eb249 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -7,8 +7,6 @@
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
- *
- *  Originally in OS.h.
  */
 //=============================================================================
 
diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h
index 12933958aa8..2fee63360c2 100644
--- a/ACE/ace/PI_Malloc.h
+++ b/ACE/ace/PI_Malloc.h
@@ -189,8 +189,7 @@ public:
   void dump () const;
 
 private:
-  // Disallow assignment.
-  void operator= (const ACE_Control_Block &);
+  void operator= (const ACE_Control_Block &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h
index 46ebef1fab0..3002550ad34 100644
--- a/ACE/ace/POSIX_Proactor.h
+++ b/ACE/ace/POSIX_Proactor.h
@@ -617,7 +617,6 @@ protected:
  */
 class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result
 {
-
   /// The factory method for this class is with the POSIX_Proactor
   /// class.
   friend class ACE_POSIX_Proactor;
@@ -635,13 +634,13 @@ protected:
                           int signal_number = ACE_SIGRTMIN);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Timer (void) {}
+  ~ACE_POSIX_Asynch_Timer (void) override = default;
 
   /// This method calls the handler's handle_timeout method.
-  virtual void complete (size_t bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error = 0);
+  void complete (size_t bytes_transferred,
+                 int success,
+                 const void *completion_key,
+                 u_long error = 0) override;
 
   /// Time value requested by caller
   ACE_Time_Value time_;
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index ba803872c35..b04ebec525d 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -19,8 +19,6 @@
 #include "ace/Based_Pointer_Repository.h"
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1  */
 
-
-
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
 #if !defined (ACE_HAS_WINCE)
 #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h
index 9c5f20337f8..4a78171b75a 100644
--- a/ACE/ace/Pagefile_Memory_Pool.h
+++ b/ACE/ace/Pagefile_Memory_Pool.h
@@ -119,7 +119,6 @@ public:
   void dump (void) const {}
 
 protected:
-
   /**
    * Map portions or the entire pool into the local virtual address
    * space.  To do this, we compute the new @c file_offset of the
@@ -131,7 +130,6 @@ protected:
   int unmap (void);
 
 private:
-
   /**
    * @class Control_Block
    *
diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h
index 7391660de18..9e16cf18447 100644
--- a/ACE/ace/Ping_Socket.h
+++ b/ACE/ace/Ping_Socket.h
@@ -85,7 +85,6 @@ public:
   static ACE_Time_Value const time_default_;
 
 private:
-
   int receive_echo_reply (ACE_Time_Value const * timeout);
 
   /// Do not allow this function to percolate up to this interface.
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 0ae4f4cd13c..a6a9874e309 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -24,8 +24,6 @@
 #include "ace/Pipe.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/ACE/ace/Proactor_Impl.h b/ACE/ace/Proactor_Impl.h
index f8851eacab3..ddd98917d7c 100644
--- a/ACE/ace/Proactor_Impl.h
+++ b/ACE/ace/Proactor_Impl.h
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_PROACTOR_IMPL_H
 #define ACE_PROACTOR_IMPL_H
 #include /**/ "ace/pre.h"
@@ -39,13 +38,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class ACE_Export ACE_Proactor_Impl : public ACE_Event_Handler
 {
-
 public:
   /// Virtual destruction.
-  virtual ~ACE_Proactor_Impl (void);
+  virtual ~ACE_Proactor_Impl ();
 
   /// Close the IO completion port.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /// This method adds the @a handle to the I/O completion port. This
   /// function is a no-op function for Unix systems.
@@ -67,22 +65,22 @@ public:
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
-  virtual int handle_events (void) = 0;
+  virtual int handle_events () = 0;
 
   /// Add wakeup dispatch threads (reinit).
-  virtual int wake_up_dispatch_threads (void) = 0;
+  virtual int wake_up_dispatch_threads () = 0;
 
   /// Close all dispatch threads.
   virtual int close_dispatch_threads (int wait) = 0;
 
   /// Get number of thread used as a parameter to CreatIoCompletionPort.
-  virtual size_t number_of_threads (void) const = 0;
+  virtual size_t number_of_threads () const = 0;
 
   /// Set number of thread used as a parameter to CreatIoCompletionPort.
   virtual void number_of_threads (size_t threads) = 0;
 
   /// Get the event handle.
-  virtual ACE_HANDLE get_handle (void) const = 0;
+  virtual ACE_HANDLE get_handle () const = 0;
 
   //
   // = Factory methods for the operations
@@ -91,33 +89,33 @@ public:
   // methods.
 
   /// Create the correct implementation class for doing Asynch_Read_Stream.
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void) = 0;
+  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream () = 0;
 
   /// Create the correct implementation class for doing Asynch_Write_Stream.
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void) = 0;
+  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream () = 0;
 
   /// Create the correct implementation class for doing Asynch_Read_File.
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void) = 0;
+  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file () = 0;
 
     /// Create the correct implementation class for doing Asynch_Write_File.
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void) = 0;
+  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file () = 0;
 
   /// Create the correct implementation class for doing Asynch_Accept.
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void) = 0;
+  virtual ACE_Asynch_Accept_Impl *create_asynch_accept () = 0;
 
   /// Create the correct implementation class for doing Asynch_Connect.
-  virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void) = 0;
+  virtual ACE_Asynch_Connect_Impl *create_asynch_connect () = 0;
 
   /// Create the correct implementation class for doing Asynch_Transmit_File.
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void) = 0;
+  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file () = 0;
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_Dgram.
-  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void) = 0;
+  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram () = 0;
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_Dgram.
-  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void) = 0;
+  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram () = 0;
 
   //
   // = Factory methods for the results
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 90adcae52fc..886d1cf6247 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -687,14 +687,12 @@ private:
 class ACE_Export ACE_Managed_Process : public ACE_Process
 {
 public:
-
   /// Cleanup by deleting @c this.
   virtual void unmanage ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   /// Make sure that we're allocated dynamically!
   virtual ~ACE_Managed_Process ();
 };
diff --git a/ACE/ace/Process_Mutex.cpp b/ACE/ace/Process_Mutex.cpp
index 3c0cd195b5a..5e89bf7c23a 100644
--- a/ACE/ace/Process_Mutex.cpp
+++ b/ACE/ace/Process_Mutex.cpp
@@ -9,8 +9,6 @@
 #include "ace/Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex)
diff --git a/ACE/ace/Process_Semaphore.cpp b/ACE/ace/Process_Semaphore.cpp
index 9b40f67d0db..fa90ff58a47 100644
--- a/ACE/ace/Process_Semaphore.cpp
+++ b/ACE/ace/Process_Semaphore.cpp
@@ -11,8 +11,6 @@
 
 #include "ace/ACE.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Semaphore)
diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h
index 57d47da2b05..1024d70b6da 100644
--- a/ACE/ace/Process_Semaphore.h
+++ b/ACE/ace/Process_Semaphore.h
@@ -148,7 +148,6 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-
 #if defined (__ACE_INLINE__)
 #include "ace/Process_Semaphore.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp
index 0d807f96dad..b0ae13790bc 100644
--- a/ACE/ace/Profile_Timer.cpp
+++ b/ACE/ace/Profile_Timer.cpp
@@ -12,8 +12,6 @@
 #include "ace/OS_NS_unistd.h"
 #endif
 
-
-
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
 #include "ace/OS_NS_stdio.h"
@@ -25,7 +23,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
 
-
 void
 ACE_Profile_Timer::dump () const
 {
diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h
index 28a905a2862..601b473e33b 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.h
+++ b/ACE/ace/QoS/QoS_Session_Impl.h
@@ -19,7 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #if defined (ACE_HAS_RAPI)
 #include "rapi_lib.h"
 
@@ -37,9 +36,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session
 {
-
 public:
-
   /// Default destructor.
   ~ACE_RAPI_Session (void);
 
@@ -125,7 +122,6 @@ public:
   friend class ACE_QoS_Session_Factory;
 
 private:
-
   /// Default constuctor. Constructor is defined private so that only
   /// the friend factory can instantiate this class.
   ACE_RAPI_Session (void);
@@ -162,7 +158,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session
 {
-
 public:
 
   /// Default destructor.
@@ -246,11 +241,9 @@ public:
   friend class ACE_QoS_Session_Factory;
 
 private:
-
   /// Default constructor. Constructor is defined private so that only
   /// the friend factory can instantiate this class.
-  ACE_GQoS_Session (void);
-
+  ACE_GQoS_Session ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index 787ca5555d1..511386ef638 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -16,7 +16,6 @@
 #define IMR_MULTIADDR imr_multiaddr
 #endif /* ! defined (IMR_MULTIADDR) */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS)
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index b640f4c8082..3d1ca20e881 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -113,7 +113,6 @@ public:
 private:
   // = Disable public <open> method to ensure class used properly.
 
-
   /// Subscribe to the multicast interface using QoS-enabled semantics.
   int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
                      const ACE_QoS_Params &qos_params,
@@ -125,7 +124,6 @@ private:
 
   /// Manages the QoS sessions that this socket subscribes to.
   ACE_QoS_Manager qos_manager_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp
index b953a0e6cbe..19a716fc1c2 100644
--- a/ACE/ace/RB_Tree.cpp
+++ b/ACE/ace/RB_Tree.cpp
@@ -23,7 +23,6 @@ ACE_ALLOC_HOOK_DEFINE_Tc4(ACE_RB_Tree_Iterator)
 ACE_ALLOC_HOOK_DEFINE_Tc4(ACE_RB_Tree_Reverse_Iterator)
 
 // Constructor.
-
 template <class EXT_ID, class INT_ID>
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)
   : k_ (k),
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index 4c7b773ef27..c8ef635b3a4 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -200,13 +200,13 @@ public:
   typedef ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> reverse_iterator;
 
   /// Constructor.
-  ACE_RB_Tree (ACE_Allocator *alloc = 0);
+  ACE_RB_Tree (ACE_Allocator *alloc = nullptr);
 
   /// Copy constructor.
   ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt);
 
   /// Initialize an RB Tree.
-  int open (ACE_Allocator *alloc = 0);
+  int open (ACE_Allocator *alloc = nullptr);
 
   /// Close down an RB_Tree and release dynamically allocated
   /// resources.
@@ -870,7 +870,6 @@ public:
    * from the derived classes and placed in the base class.
    */
   int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl
index 4e31894eb4d..1f9d1bdf420 100644
--- a/ACE/ace/RB_Tree.inl
+++ b/ACE/ace/RB_Tree.inl
@@ -10,7 +10,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 /////////////////////////////////////////////////////
 
 // Key accessor.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE EXT_ID &
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::key ()
@@ -19,9 +18,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::key ()
   return k_;
 }
 
-
 // Item accessor.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE INT_ID &
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::item ()
@@ -30,9 +27,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::item ()
   return t_;
 }
 
-
 // Set color of the node.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE void
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Color c)
@@ -41,9 +36,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Col
   color_ = c;
 }
 
-
 // Get color of the node.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE ACE_RB_Tree_Node_Base::RB_Tree_Node_Color
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::color ()
@@ -52,9 +45,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color ()
   return color_;
 }
 
-
 // Accessor for node's parent pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent ()
@@ -63,9 +54,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent ()
   return parent_;
 }
 
-
 // Mutator for node's parent pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE void
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p)
@@ -74,10 +63,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p)
   parent_ = p;
 }
 
-
-
 // Accessor for node's left child pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::left ()
@@ -86,9 +72,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left ()
   return left_;
 }
 
-
 // Mutator for node's left child pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE void
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l)
@@ -97,9 +81,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l)
   left_ = l;
 }
 
-
 // Accessor for node's right child pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::right ()
@@ -108,9 +90,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right ()
   return right_;
 }
 
-
 // Mutator for node's right child pointer.
-
 template <class EXT_ID, class INT_ID>
 ACE_INLINE void
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r)
@@ -119,7 +99,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r)
   right_ = r;
 }
 
-
 ////////////////////////////////////////////////////////////////////////
 // template class ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
 ////////////////////////////////////////////////////////////////////////
@@ -151,7 +130,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open (ACE_Allocator *alloc)
 
 // Close down an RB_Tree and release dynamically allocated
 // resources.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close ()
@@ -162,12 +140,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close ()
   return this->close_i ();
 }
 
-
 // Associate <ext_id> with <int_id>.  If <ext_id> is already in the
 // tree then the <ACE_RB_Tree_Node> is not changed.  Returns 0 if a
 // new entry is bound successfully, returns 1 if an attempt is made
 // to bind an existing entry, and returns -1 if failures occur.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
@@ -180,11 +156,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
   return this->insert_i (ext_id, int_id, entry);
 }
 
-
 // Same as a normal bind, except the tree entry is also passed back
 // to the caller.  The entry in this case will either be the newly
 // created entry, or the existing one.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
@@ -197,13 +171,11 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
   return this->insert_i (ext_id, int_id, entry);
 }
 
-
 // Associate <ext_id> with <int_id> if and only if <ext_id> is not
 // in the tree.  If <ext_id> is already in the tree then the <int_id>
 // parameter is assigned the existing value in the tree.  Returns 0
 // if a new entry is bound successfully, returns 1 if an attempt is
 // made to bind an existing entry, and returns -1 if failures occur.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id,
@@ -223,11 +195,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_
   return result;
 }
 
-
 // Same as a normal trybind, except the tree entry is also passed
 // back to the caller.  The entry in this case will either be the
 // newly created entry, or the existing one.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id,
@@ -237,7 +207,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_
   ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  int result = this->insert_i (ext_id, int_id, entry);
+  int const result = this->insert_i (ext_id, int_id, entry);
 
   if (result == 1)
     {
@@ -248,7 +218,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_
   return result;
 }
 
-
 // Reassociate <ext_id> with <int_id>.  If <ext_id> is not in the
 // tree then behaves just like <bind>.  Returns 0 if a new entry is
 // bound successfully, returns 1 if an existing entry was rebound,
@@ -274,11 +243,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
   return result;
 }
 
-
 // Same as a normal rebind, except the tree entry is also passed back
 // to the caller.  The entry in this case will either be the newly
 // created entry, or the existing one.
-
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
@@ -288,7 +255,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
   ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  int result = this->insert_i (ext_id, int_id, entry);
+  int const result = this->insert_i (ext_id, int_id, entry);
 
   if (result == 1)
     {
@@ -299,7 +266,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
   return result;
 }
 
-
 // Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
 // then behaves just like <bind>.  Otherwise, store the old value of
 // <int_id> into the "out" parameter and rebind the new parameters.
diff --git a/ACE/ace/RW_Mutex.cpp b/ACE/ace/RW_Mutex.cpp
index 9a4fbaef0c1..3a9a7a488ae 100644
--- a/ACE/ace/RW_Mutex.cpp
+++ b/ACE/ace/RW_Mutex.cpp
@@ -1,8 +1,6 @@
 /**
  * @file RW_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
@@ -16,8 +14,6 @@
 
 #include "ace/Log_Category.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/ACE/ace/RW_Mutex.h b/ACE/ace/RW_Mutex.h
index f01f4dc035f..7dd515a84d3 100644
--- a/ACE/ace/RW_Mutex.h
+++ b/ACE/ace/RW_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    RW_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -121,9 +119,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_RW_Mutex &);
-  ACE_RW_Mutex (const ACE_RW_Mutex &);
+  void operator= (const ACE_RW_Mutex &) = delete;
+  ACE_RW_Mutex (const ACE_RW_Mutex &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/RW_Process_Mutex.cpp b/ACE/ace/RW_Process_Mutex.cpp
index 19acafb8577..af95146270e 100644
--- a/ACE/ace/RW_Process_Mutex.cpp
+++ b/ACE/ace/RW_Process_Mutex.cpp
@@ -2,8 +2,6 @@
 #include "ace/Log_Category.h"
 #include "ace/ACE.h"
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/RW_Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/RW_Thread_Mutex.cpp b/ACE/ace/RW_Thread_Mutex.cpp
index c77a75c30d7..c71aca2eb4c 100644
--- a/ACE/ace/RW_Thread_Mutex.cpp
+++ b/ACE/ace/RW_Thread_Mutex.cpp
@@ -1,8 +1,6 @@
 /**
  * @file RW_Thread_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
@@ -20,8 +18,6 @@
 
 #include "ace/Guard_T.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Thread_Mutex)
diff --git a/ACE/ace/RW_Thread_Mutex.h b/ACE/ace/RW_Thread_Mutex.h
index 54a4ebcfaa5..265e4d161dc 100644
--- a/ACE/ace/RW_Thread_Mutex.h
+++ b/ACE/ace/RW_Thread_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    RW_Thread_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index c43a28be8d9..cf8b2bc291b 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -885,13 +885,12 @@ protected:
   static bool delete_reactor_;
 
   /// Deny access since member-wise won't work...
-  ACE_Reactor (const ACE_Reactor &);
-  ACE_Reactor &operator = (const ACE_Reactor &);
+  ACE_Reactor (const ACE_Reactor &) = delete;
+  ACE_Reactor &operator = (const ACE_Reactor &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-
 #if defined (__ACE_INLINE__)
 #include "ace/Reactor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp
index 047a334a24b..398f56bff1e 100644
--- a/ACE/ace/Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Recursive_Thread_Mutex.cpp
@@ -1,8 +1,6 @@
 /**
  * @file Recursive_Thread_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h
index f88e7b79a1c..4cb90a99689 100644
--- a/ACE/ace/Recursive_Thread_Mutex.h
+++ b/ACE/ace/Recursive_Thread_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Recursive_Thread_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> and
  *          Abdullah Sowayan <abdullah.sowayan@lmco.com>
  */
@@ -175,9 +173,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Recursive_Thread_Mutex &);
-  ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &);
+  void operator= (const ACE_Recursive_Thread_Mutex &) = delete;
+  ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h
index 4326ac3f80f..3433ba72fe1 100644
--- a/ACE/ace/Remote_Tokens.h
+++ b/ACE/ace/Remote_Tokens.h
@@ -301,9 +301,8 @@ protected:
   static ACE_INET_Addr server_address_;
 
 private:
-  /// Private: should not be used
-  ACE_TSS_Connection (const ACE_TSS_Connection &);
-  void operator= (const ACE_TSS_Connection &);
+  ACE_TSS_Connection (const ACE_TSS_Connection &) = delete;
+  void operator= (const ACE_TSS_Connection &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h
index 571deb0de85..4cf546c6148 100644
--- a/ACE/ace/Reverse_Lock_T.h
+++ b/ACE/ace/Reverse_Lock_T.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Reverse_Lock_T.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/SOCK.cpp b/ACE/ace/SOCK.cpp
index 6dae4f91b79..651014e1d99 100644
--- a/ACE/ace/SOCK.cpp
+++ b/ACE/ace/SOCK.cpp
@@ -8,8 +8,6 @@
 #include "ace/SOCK.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK)
diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h
index 62ef4b9121c..91ac4878cbd 100644
--- a/ACE/ace/SOCK.h
+++ b/ACE/ace/SOCK.h
@@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_SOCK : public ACE_IPC_SAP
 {
 public:
-
   /// Wrapper around the @c setsockopt system call.
   int set_option (int level,
                   int option,
@@ -94,7 +93,6 @@ public:
             int reuse_addr);
 
 protected:
-
   /// Constructor with arguments to call the BSD-style @c socket system
   /// call (no QoS).
   ACE_SOCK (int type,
diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp
index af0fd98670d..19af145fa81 100644
--- a/ACE/ace/SOCK_Acceptor.cpp
+++ b/ACE/ace/SOCK_Acceptor.cpp
@@ -17,8 +17,6 @@
 #include "ace/OS_QoS.h"
 #endif  // ACE_HAS_WINCE
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor)
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp
index 53fadc3e2c5..b3bf9c9f774 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Bcast.cpp
@@ -14,8 +14,6 @@
 #include "ace/SOCK_Dgram_Bcast.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast)
diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index 65c261aaac2..ba586c153b6 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -12,8 +12,6 @@
 #include "ace/SOCK_IO.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO)
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
index 8efe8acfc9b..cacf3b076a8 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -11,21 +11,17 @@
 #include "ace/SOCK_SEQPACK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor)
 
 // Do nothing routine for constructor.
-
 ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor ()
 {
   ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor");
 }
 
 // Performs the timed accept operation.
-
 int
 ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout,
                                         bool restart,
@@ -95,7 +91,6 @@ ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association ne
 }
 
 // General purpose routine for accepting new connections.
-
 int
 ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association,
                            ACE_Addr *remote_addr,
diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp
index ef250e4bca1..4fa2da226f0 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Association.cpp
@@ -9,8 +9,6 @@
 #include "ace/SOCK_SEQPACK_Association.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association)
diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp
index ba95da79993..61572837a45 100644
--- a/ACE/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp
@@ -16,8 +16,6 @@
 #include "ace/SOCK_SEQPACK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector)
diff --git a/ACE/ace/SPIPE.cpp b/ACE/ace/SPIPE.cpp
index 546307a9355..e84042104ff 100644
--- a/ACE/ace/SPIPE.cpp
+++ b/ACE/ace/SPIPE.cpp
@@ -10,8 +10,6 @@
 #include "ace/SPIPE.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE)
diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h
index 5435477e551..485e866274d 100644
--- a/ACE/ace/SPIPE.h
+++ b/ACE/ace/SPIPE.h
@@ -98,7 +98,7 @@ private:
 
 protected:
   /// Ensure that this class is an abstract base class
-  ACE_SPIPE (void);
+  ACE_SPIPE ();
 
   /// Our local address.
   ACE_SPIPE_Addr local_addr_;
diff --git a/ACE/ace/SPIPE_Addr.cpp b/ACE/ace/SPIPE_Addr.cpp
index a12c0c79e68..81240d557eb 100644
--- a/ACE/ace/SPIPE_Addr.cpp
+++ b/ACE/ace/SPIPE_Addr.cpp
@@ -14,8 +14,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr)
 void
 ACE_SPIPE_Addr::dump () const
 {
-#if defined (ACE_HAS_DUMP)
-#endif /* ACE_HAS_DUMP */
 }
 
 // Set a pointer to the address.
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp
index bfb24eb91fd..2bcf32ce187 100644
--- a/ACE/ace/SPIPE_Connector.cpp
+++ b/ACE/ace/SPIPE_Connector.cpp
@@ -12,8 +12,6 @@
 #include "ace/SPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector)
diff --git a/ACE/ace/SPIPE_Stream.cpp b/ACE/ace/SPIPE_Stream.cpp
index 003aa7c860d..b824d53a62e 100644
--- a/ACE/ace/SPIPE_Stream.cpp
+++ b/ACE/ace/SPIPE_Stream.cpp
@@ -9,7 +9,6 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream)
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 7a965995a76..f6984515214 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -367,10 +367,8 @@ protected:
   //@}
 
 private:
-
-  // Preventing copying through construction or assignment.
-  ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &);
-  ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &);
+  ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &) = delete;
+  ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &) = delete;
 
 protected:
   /// Stream Type ST_CLIENT/ST_SERVER
diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h
index fc6d39fa637..f0c9dfac81d 100644
--- a/ACE/ace/SSL/SSL_Context.h
+++ b/ACE/ace/SSL/SSL_Context.h
@@ -367,11 +367,8 @@ private:
   void ssl_library_init ();
   void ssl_library_fini ();
 
-  // = Prevent assignment and copy initialization.
-  //@{
-  ACE_SSL_Context (const ACE_SSL_Context &);
-  ACE_SSL_Context & operator= (const ACE_SSL_Context &);
-  //@}
+  ACE_SSL_Context (const ACE_SSL_Context &) = delete;
+  ACE_SSL_Context & operator= (const ACE_SSL_Context &) = delete;
 
 private:
   /// The SSL_CTX structure
diff --git a/ACE/ace/SString.cpp b/ACE/ace/SString.cpp
index d7732205bdf..abd86b337cb 100644
--- a/ACE/ace/SString.cpp
+++ b/ACE/ace/SString.cpp
@@ -13,7 +13,6 @@
 #include "ace/SString.inl"
 #endif /* __ACE_INLINE__ */
 
-
 // ************************************************************
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h
index 2d599c6e54a..81651b78dbb 100644
--- a/ACE/ace/SString.h
+++ b/ACE/ace/SString.h
@@ -59,39 +59,40 @@ public:
   using ACE_WString::size_type;
 
   /// Default constructor.
-  ACE_NS_WString (ACE_Allocator *alloc = 0);
+  ACE_NS_WString (ACE_Allocator *alloc = nullptr);
 
   /// Constructor that copies @a s into dynamically allocated memory.
   ACE_NS_WString (const char *s,
-                  ACE_Allocator *alloc = 0);
+                  ACE_Allocator *alloc = nullptr);
 
   /// Constructor that copies @a s into dynamically allocated memory.
   ACE_NS_WString (const ACE_WSTRING_TYPE *s,
-                  ACE_Allocator *alloc = 0);
+                  ACE_Allocator *alloc = nullptr);
 
 #if defined (ACE_WSTRING_HAS_USHORT_SUPPORT)
   /// Constructor that takes in a ushort16 string (mainly used by the
   /// ACE Name_Space classes)
   ACE_NS_WString (const ACE_UINT16 *s,
                   size_type len,
-                  ACE_Allocator *alloc = 0);
+                  ACE_Allocator *alloc = nullptr);
 #endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */
 
   /// Constructor that copies @a len ACE_WSTRING_TYPE's of @a s into dynamically
   /// allocated memory (will NUL terminate the result).
   ACE_NS_WString (const ACE_WSTRING_TYPE *s,
                   size_type len,
-                  ACE_Allocator *alloc = 0);
+                  ACE_Allocator *alloc = nullptr);
 
   /// Constructor that dynamically allocates memory for @a len + 1
   /// ACE_WSTRING_TYPE characters. The newly created memory is set memset to 0.
-  ACE_NS_WString (size_type len, ACE_Allocator *alloc = 0);
+  ACE_NS_WString (size_type len, ACE_Allocator *alloc = nullptr);
 
   /// Copy constructor.
-  ACE_NS_WString (const ACE_NS_WString &s);
+  ACE_NS_WString (const ACE_NS_WString &s) = default;
+  ACE_NS_WString &operator= (const ACE_NS_WString&) = default;
 
   /// Constructor that copies @a c into dynamically allocated memory.
-  ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = 0);
+  ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = nullptr);
 
   /// Transform into a copy of the ASCII character representation.
   /// (caller must delete)
@@ -136,20 +137,20 @@ public:
   static const size_type npos;
 
   /// Default constructor.
-  ACE_SString (ACE_Allocator *alloc = 0);
+  ACE_SString (ACE_Allocator *alloc = nullptr);
 
   /// Constructor that copies @a s into dynamically allocated memory.
-  ACE_SString (const char *s, ACE_Allocator *alloc = 0);
+  ACE_SString (const char *s, ACE_Allocator *alloc = nullptr);
 
   /// Constructor that copies @a len chars of @a s into dynamically
   /// allocated memory (will NUL terminate the result).
-  ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = 0);
+  ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = nullptr);
 
   /// Copy constructor.
   ACE_SString (const ACE_SString &);
 
   /// Constructor that copies @a c into dynamically allocated memory.
-  ACE_SString (char c, ACE_Allocator *alloc = 0);
+  ACE_SString (char c, ACE_Allocator *alloc = nullptr);
 
   /// Default destructor.
   ~ACE_SString ();
diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl
index 5079e51a174..dd4592928f6 100644
--- a/ACE/ace/SString.inl
+++ b/ACE/ace/SString.inl
@@ -38,12 +38,6 @@ ACE_NS_WString::ACE_NS_WString (size_type len, ACE_Allocator *alloc)
 }
 
 ACE_INLINE
-ACE_NS_WString::ACE_NS_WString (const ACE_NS_WString &s)
-  : ACE_WString (s)
-{
-}
-
-ACE_INLINE
 ACE_NS_WString::ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc)
   : ACE_WString (c, alloc)
 {
diff --git a/ACE/ace/SUN_Proactor.h b/ACE/ace/SUN_Proactor.h
index 974fe9e1ef9..376a9cdf60a 100644
--- a/ACE/ace/SUN_Proactor.h
+++ b/ACE/ace/SUN_Proactor.h
@@ -62,10 +62,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor
 {
 public:
-  virtual Proactor_Type get_impl_type (void);
+  virtual Proactor_Type get_impl_type ();
 
   /// Destructor.
-  virtual ~ACE_SUN_Proactor (void);
+  virtual ~ACE_SUN_Proactor ();
 
   /// Constructor defines max number asynchronous operations that can
   /// be started at the same time.
@@ -86,7 +86,7 @@ protected:
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
-  virtual int handle_events (void);
+  virtual int handle_events ();
 
   /// Internal completion detection and dispatching.
   int handle_events_i (ACE_Time_Value *delta);
diff --git a/ACE/ace/SV_Message.cpp b/ACE/ace/SV_Message.cpp
index 182f9ca6294..75b3bf62bf3 100644
--- a/ACE/ace/SV_Message.cpp
+++ b/ACE/ace/SV_Message.cpp
@@ -9,8 +9,6 @@
 #include "ace/SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message)
diff --git a/ACE/ace/SV_Message_Queue.cpp b/ACE/ace/SV_Message_Queue.cpp
index 36bab27f258..21fa9d1cb81 100644
--- a/ACE/ace/SV_Message_Queue.cpp
+++ b/ACE/ace/SV_Message_Queue.cpp
@@ -8,8 +8,6 @@
 #include "ace/SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue)
diff --git a/ACE/ace/SV_Shared_Memory.cpp b/ACE/ace/SV_Shared_Memory.cpp
index d98fc614695..19ac6980849 100644
--- a/ACE/ace/SV_Shared_Memory.cpp
+++ b/ACE/ace/SV_Shared_Memory.cpp
@@ -8,8 +8,6 @@
 #include "ace/SV_Shared_Memory.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory)
diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp
index f9eb92d7ccf..8f63c093432 100644
--- a/ACE/ace/Sched_Params.cpp
+++ b/ACE/ace/Sched_Params.cpp
@@ -7,7 +7,6 @@
  */
 //=============================================================================
 
-
 #include "ace/Sched_Params.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,8 +18,6 @@
 #  include /**/ <sys/priocntl.h>
 #endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h
index 687ef4d382e..1c59c82a312 100644
--- a/ACE/ace/Select_Reactor.h
+++ b/ACE/ace/Select_Reactor.h
@@ -46,7 +46,7 @@ class ACE_Export ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> >
 public:
   ACE_Guard (ACE_Reactor_Token_T<ACE_Noop_Token> &) {}
   ACE_Guard (ACE_Reactor_Token_T<ACE_Noop_Token> &, int) {}
-  ~ACE_Guard (void) {}
+  ~ACE_Guard () = default
 
   int acquire (void) { return 0; }
   int tryacquire (void) { return 0; }
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 2fa258d1f5b..e9cd8fbe2da 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -584,9 +584,8 @@ private:
   /// the notification message.
   bool supress_renew_;
 
-  /// Deny access since member-wise won't work...
-  ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &);
-  ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &);
+  ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &) = delete;
+  ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index 9d901691d14..c142459a6ed 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -686,7 +686,6 @@ protected:
   sig_atomic_t deactivated_;
 
 private:
-  /// Deny access since member-wise won't work...
   ACE_Select_Reactor_T (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &) = delete;
   ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &operator=  (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &) = delete;
 };
diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h
index 9b3c0dc1215..fc46aac8a64 100644
--- a/ACE/ace/Semaphore.h
+++ b/ACE/ace/Semaphore.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Semaphore.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -165,9 +163,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Semaphore &);
-  ACE_Semaphore (const ACE_Semaphore &);
+  void operator= (const ACE_Semaphore &) = delete;
+  ACE_Semaphore (const ACE_Semaphore &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 062fdd07daf..d77fc253625 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -718,9 +718,8 @@ public:
   ~ACE_Service_Config_Guard ();
 
 private:
-  // Private AND not implemented to disable copying
-  ACE_Service_Config_Guard(const ACE_Service_Config_Guard&);
-  ACE_Service_Config_Guard& operator= (const ACE_Service_Config_Guard&);
+  ACE_Service_Config_Guard(const ACE_Service_Config_Guard&) = delete;
+  ACE_Service_Config_Guard& operator= (const ACE_Service_Config_Guard&) = delete;
 
 private:
   ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> saved_;
diff --git a/ACE/ace/Shared_Object.cpp b/ACE/ace/Shared_Object.cpp
index f1d369e2ce9..0c1cdcf2ef5 100644
--- a/ACE/ace/Shared_Object.cpp
+++ b/ACE/ace/Shared_Object.cpp
@@ -12,7 +12,6 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Initializes object when dynamic linking occurs.
-
 int
 ACE_Shared_Object::init (int, ACE_TCHAR *[])
 {
@@ -21,7 +20,6 @@ ACE_Shared_Object::init (int, ACE_TCHAR *[])
 }
 
 // Terminates object when dynamic unlinking occurs.
-
 int
 ACE_Shared_Object::fini ()
 {
@@ -30,7 +28,6 @@ ACE_Shared_Object::fini ()
 }
 
 // Returns information on active object.
-
 int
 ACE_Shared_Object::info (ACE_TCHAR **, size_t) const
 {
@@ -39,7 +36,6 @@ ACE_Shared_Object::info (ACE_TCHAR **, size_t) const
 }
 
 // Need to give a default implementation.
-
 ACE_Shared_Object::~ACE_Shared_Object ()
 {
   ACE_TRACE ("ACE_Shared_Object::~ACE_Shared_Object");
diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp
index 0867edbe20e..74c60bb2f5c 100644
--- a/ACE/ace/Signal.cpp
+++ b/ACE/ace/Signal.cpp
@@ -1,5 +1,4 @@
 #include "ace/Signal.h"
-// #include "ace/Log_Category.h"
 
 #if defined (ACE_HAS_ALLOC_HOOKS)
 # include "ace/Malloc_Base.h"
@@ -9,9 +8,6 @@
 #include "ace/Signal.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Action)
diff --git a/ACE/ace/Stats.cpp b/ACE/ace/Stats.cpp
index 30d60338c40..9af7cb4a35e 100644
--- a/ACE/ace/Stats.cpp
+++ b/ACE/ace/Stats.cpp
@@ -7,8 +7,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_UINT32
diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index 47315c40131..8e240e6dcd7 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -1,9 +1,6 @@
-// Stream.cpp
 #ifndef ACE_STREAM_CPP
 #define ACE_STREAM_CPP
 
-
-//#include "ace/Module.h"
 #include "ace/Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index 5e1265369d6..3ca0d39ae80 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -147,8 +147,6 @@ static ACE_Module_Type *
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
diff --git a/ACE/ace/Synch_Traits.h b/ACE/ace/Synch_Traits.h
index 3a4c52dd1ab..9232bf4c969 100644
--- a/ACE/ace/Synch_Traits.h
+++ b/ACE/ace/Synch_Traits.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Synch_Traits.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp
index 2c101d82709..0e2548c014d 100644
--- a/ACE/ace/TLI.cpp
+++ b/ACE/ace/TLI.cpp
@@ -1,6 +1,5 @@
 // Defines the member functions for the base class of the ACE_TLI
 // abstraction.
-
 #include "ace/TLI.h"
 #include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
@@ -9,8 +8,6 @@
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Auto_Ptr.h"
 
-
-
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/TLI.h b/ACE/ace/TLI.h
index d2091787c38..bfa0e19584c 100644
--- a/ACE/ace/TLI.h
+++ b/ACE/ace/TLI.h
@@ -59,7 +59,7 @@ public:
                    struct t_info *info = 0);
 
   /// Close a TLI endpoint and release resources.
-  int close (void);
+  int close ();
 
   /// Set underlying protocol options.
   int set_option (int level, int option, void *optval, int optlen);
@@ -68,11 +68,11 @@ public:
   int get_option (int level, int option, void *optval, int &optlen);
 
   // = Calls to underlying TLI operations.
-  int look (void) const;
+  int look () const;
   int rcvdis (struct t_discon * = 0) const;
   int snddis (struct t_call * = 0) const;
-  int sndrel (void) const;
-  int rcvrel (void) const;
+  int sndrel () const;
+  int rcvrel () const;
 
   /// Return our local endpoint address.
   int get_local_addr (ACE_Addr &) const;
@@ -86,10 +86,10 @@ public:
 protected:
   // = Ensure we are an abstract class.
   /// Default constructor.
-  ACE_TLI (void);
+  ACE_TLI ();
 
   /// Destructor.
-  ~ACE_TLI (void);
+  ~ACE_TLI ();
 
   /// Initialize a TLI endpoint.
   ACE_TLI (const char device[], int oflag = O_RDWR, struct t_info *info = 0);
diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp
index 4014907521f..bd81572e2e1 100644
--- a/ACE/ace/TLI_Acceptor.cpp
+++ b/ACE/ace/TLI_Acceptor.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-
-
 #if defined (ACE_HAS_TLI)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,7 +21,7 @@ struct ACE_TLI_Request
 class ACE_TLI_Request_Queue
 {
 public:
-  ACE_TLI_Request_Queue (void);
+  ACE_TLI_Request_Queue ();
 
   ACE_HANDLE open (ACE_HANDLE fd, int size);
   int close (void);
@@ -32,10 +30,10 @@ public:
   int dequeue (ACE_TLI_Request *&ptr);
   int remove (int sequence_number);
 
-  int is_empty (void) const;
-  int is_full (void) const;
+  int is_empty () const;
+  int is_full () const;
 
-  ACE_TLI_Request *alloc (void);
+  ACE_TLI_Request *alloc ();
   void    free (ACE_TLI_Request *node);
 
   void dump () const;
diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp
index 42682e4dc29..ba4d6524d0c 100644
--- a/ACE/ace/TLI_Connector.cpp
+++ b/ACE/ace/TLI_Connector.cpp
@@ -1,7 +1,5 @@
 #include "ace/TLI_Connector.h"
 
-
-
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h
index 38b2e7d4b54..3b2a99e09a3 100644
--- a/ACE/ace/TLI_Connector.h
+++ b/ACE/ace/TLI_Connector.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_TLI_CONNECTOR_H
 #define ACE_TLI_CONNECTOR_H
 #include /**/ "ace/pre.h"
diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp
index 3f20739a477..3577169396a 100644
--- a/ACE/ace/TLI_Stream.cpp
+++ b/ACE/ace/TLI_Stream.cpp
@@ -5,8 +5,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 
-
-
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index 0a8a326443c..f8e59ccc0b7 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -302,9 +302,8 @@ private:
   int post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info,int status);
 
 private:
-  /// Deny access since member-wise won't work...
-  ACE_TP_Reactor (const ACE_TP_Reactor &);
-  ACE_TP_Reactor &operator = (const ACE_TP_Reactor &);
+  ACE_TP_Reactor (const ACE_TP_Reactor &) = delete;
+  ACE_TP_Reactor &operator = (const ACE_TP_Reactor &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/TSS_Adapter.cpp b/ACE/ace/TSS_Adapter.cpp
index 38a31872e30..938ca6bb822 100644
--- a/ACE/ace/TSS_Adapter.cpp
+++ b/ACE/ace/TSS_Adapter.cpp
@@ -1,8 +1,6 @@
 /**
  * @file TSS_Adapter.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h
index 06abdac3803..f5dbc99fd0f 100644
--- a/ACE/ace/TSS_Adapter.h
+++ b/ACE/ace/TSS_Adapter.h
@@ -4,8 +4,6 @@
 /**
  *  @file    TSS_Adapter.h
  *
- *   Originally in Synch.h
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h
index f894912f50b..963c2a8b07f 100644
--- a/ACE/ace/TSS_T.h
+++ b/ACE/ace/TSS_T.h
@@ -4,8 +4,6 @@
 /**
  *  @file    TSS_T.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h
index 860184d7de2..5b2a414fcbc 100644
--- a/ACE/ace/TTY_IO.h
+++ b/ACE/ace/TTY_IO.h
@@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_TTY_IO : public ACE_DEV_IO
 {
 public:
-  ACE_TTY_IO (void);
+  ACE_TTY_IO ();
 
   enum Control_Mode
   {
@@ -44,7 +44,7 @@ public:
 
   struct ACE_Export Serial_Params
   {
-    Serial_Params (void);
+    Serial_Params ();
 
     /** Specifies the baudrate at which the communication port operates. */
     int baudrate;
diff --git a/ACE/ace/Task.h b/ACE/ace/Task.h
index 92a6e788f41..4d6cd358eba 100644
--- a/ACE/ace/Task.h
+++ b/ACE/ace/Task.h
@@ -282,10 +282,8 @@ protected:
   /// Holds the thread ID of the last thread to exit svc() in this object.
   ACE_thread_t  last_thread_id_;
 private:
-
-  // = Disallow these operations.
-  ACE_Task_Base &operator= (const ACE_Task_Base &);
-  ACE_Task_Base (const ACE_Task_Base &);
+  ACE_Task_Base &operator= (const ACE_Task_Base &) = delete;
+  ACE_Task_Base (const ACE_Task_Base &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h
index 69b235668e7..c8aafb5e050 100644
--- a/ACE/ace/Task_T.h
+++ b/ACE/ace/Task_T.h
@@ -168,7 +168,6 @@ public: // Should be protected:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  // = Disallow these operations.
   void operator= (const ACE_Task<ACE_SYNCH_USE, TIME_POLICY> &) = delete;
   ACE_Task (const ACE_Task<ACE_SYNCH_USE, TIME_POLICY> &) = delete;
 };
diff --git a/ACE/ace/Thread_Mutex.cpp b/ACE/ace/Thread_Mutex.cpp
index 1881d405579..4bf4cca5e83 100644
--- a/ACE/ace/Thread_Mutex.cpp
+++ b/ACE/ace/Thread_Mutex.cpp
@@ -1,8 +1,6 @@
 /**
  * @file Thread_Mutex.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
@@ -17,8 +15,6 @@
 #include "ace/Log_Category.h"
 #include "ace/Malloc_T.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex)
diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h
index 72e1e5e6e37..3793c5654ed 100644
--- a/ACE/ace/Thread_Mutex.h
+++ b/ACE/ace/Thread_Mutex.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Thread_Mutex.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
@@ -156,9 +154,8 @@ protected:
   bool removed_;
 
 private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Thread_Mutex &);
-  ACE_Thread_Mutex (const ACE_Thread_Mutex &);
+  void operator= (const ACE_Thread_Mutex &) = delete;
+  ACE_Thread_Mutex (const ACE_Thread_Mutex &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Thread_Semaphore.cpp b/ACE/ace/Thread_Semaphore.cpp
index a4a18d5e788..41eabea789a 100644
--- a/ACE/ace/Thread_Semaphore.cpp
+++ b/ACE/ace/Thread_Semaphore.cpp
@@ -1,8 +1,6 @@
 /**
  * @file Thread_Semaphore.cpp
  *
- * Originally in Synch.cpp
- *
  * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 
@@ -20,9 +18,6 @@
 
 #include "ace/ACE.h"
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Semaphore)
diff --git a/ACE/ace/Thread_Semaphore.h b/ACE/ace/Thread_Semaphore.h
index f1d80beb55c..f5ada7cad3b 100644
--- a/ACE/ace/Thread_Semaphore.h
+++ b/ACE/ace/Thread_Semaphore.h
@@ -4,8 +4,6 @@
 /**
  *  @file    Thread_Semaphore.h
  *
- *   Moved from Synch.h.
- *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
 //==========================================================================
diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp
index 5db90f1d593..4a472d27c3d 100644
--- a/ACE/ace/Throughput_Stats.cpp
+++ b/ACE/ace/Throughput_Stats.cpp
@@ -5,16 +5,8 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Log_Category.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Throughput_Stats::ACE_Throughput_Stats ()
-  : ACE_Basic_Stats ()
-  , throughput_last_ (0)
-{
-}
-
 void
 ACE_Throughput_Stats::sample (ACE_UINT64 throughput,
                               ACE_UINT64 latency)
diff --git a/ACE/ace/Throughput_Stats.h b/ACE/ace/Throughput_Stats.h
index f3d1744c562..0d3f71f53eb 100644
--- a/ACE/ace/Throughput_Stats.h
+++ b/ACE/ace/Throughput_Stats.h
@@ -44,7 +44,7 @@ class ACE_Export ACE_Throughput_Stats : public ACE_Basic_Stats
 {
 public:
   /// Constructor
-  ACE_Throughput_Stats (void);
+  ACE_Throughput_Stats () = default;
 
   /// Store one sample
   void sample (ACE_UINT64 throughput, ACE_UINT64 latency);
@@ -62,7 +62,7 @@ public:
                                ACE_UINT32 samples_count);
 private:
   /// The last throughput measurement.
-  ACE_UINT64 throughput_last_;
+  ACE_UINT64 throughput_last_ {};
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index 24b8ee58efe..6e8678860fb 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -39,9 +39,6 @@ const ACE_Time_Value ACE_Time_Value::max_time (
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Time_Value)
 
-ACE_Time_Value::~ACE_Time_Value()
-{}
-
 /// Increment microseconds (the only reason this is here is to allow
 /// the use of ACE_Atomic_Op with ACE_Time_Value).
 ACE_Time_Value
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h
index c543896ca90..8e1f7de6383 100644
--- a/ACE/ace/Time_Value.h
+++ b/ACE/ace/Time_Value.h
@@ -88,7 +88,7 @@ public:
   }
 
   /// Destructor
-  virtual ~ACE_Time_Value ();
+  virtual ~ACE_Time_Value () = default;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Timeprobe.cpp b/ACE/ace/Timeprobe.cpp
index d1895827f2a..be7fe698c89 100644
--- a/ACE/ace/Timeprobe.cpp
+++ b/ACE/ace/Timeprobe.cpp
@@ -1,7 +1,5 @@
 #include "ace/config-all.h"
 
-
-
 #if defined (ACE_COMPILE_TIMEPROBES)
 
 #include "ace/Timeprobe.h"
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index b29d8bc7b7d..0a1be5f8434 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -39,7 +39,6 @@ ACE_HEAP_LCHILD (size_t X)
 }
 
 // Constructor that takes in an <ACE_Timer_Heap_T> to iterate over.
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_Iterator_T (
   Heap & heap)
@@ -49,13 +48,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_
   this->first ();
 }
 
-template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T ()
-{
-}
-
 // Positions the iterator at the first node in the heap array
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
@@ -64,7 +57,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
 }
 
 // Positions the iterator at the next node in the heap array
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
@@ -74,7 +66,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
 }
 
 // Returns true the <position_> is at the end of the heap array
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const
 {
@@ -82,7 +73,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const
 }
 
 // Returns the node at the current position in the heap or 0 if at the end
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item ()
 {
diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h
index eed63517e1c..4dcd896665d 100644
--- a/ACE/ace/Timer_Heap_T.h
+++ b/ACE/ace/Timer_Heap_T.h
@@ -45,19 +45,19 @@ public:
   ACE_Timer_Heap_Iterator_T (Heap &);
 
   /// Destructor.
-  virtual ~ACE_Timer_Heap_Iterator_T ();
+  ~ACE_Timer_Heap_Iterator_T () override = default;
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first ();
+  void first () override;
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next ();
+  void next () override;
 
   /// Returns true when there are no more nodes in the sequence
-  virtual bool isdone () const;
+  bool isdone () const override;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE> *item ();
+  ACE_Timer_Node_T<TYPE> *item () override;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp
index 40965be1433..5caf9098553 100644
--- a/ACE/ace/Timer_Queue_Iterator.cpp
+++ b/ACE/ace/Timer_Queue_Iterator.cpp
@@ -51,11 +51,6 @@ ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T ()
 }
 
 template <class TYPE>
-ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T ()
-{
-}
-
-template <class TYPE>
 ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T ()
 {
 }
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index 51aa013518a..ebb30d5dddf 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -163,7 +163,7 @@ class ACE_Timer_Queue_Iterator_T
 {
 public:
   /// Constructor.
-  ACE_Timer_Queue_Iterator_T ();
+  ACE_Timer_Queue_Iterator_T () = default;
 
   /// Destructor.
   virtual ~ACE_Timer_Queue_Iterator_T ();
diff --git a/ACE/ace/Token.cpp b/ACE/ace/Token.cpp
index e142ea5e007..b8312287a85 100644
--- a/ACE/ace/Token.cpp
+++ b/ACE/ace/Token.cpp
@@ -4,8 +4,6 @@
 # include "ace/Token.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/Thread.h"
diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp
index c15d7cf9c51..c67950243ad 100644
--- a/ACE/ace/Token_Collection.cpp
+++ b/ACE/ace/Token_Collection.cpp
@@ -6,7 +6,6 @@
 #include "ace/Token_Collection.inl"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Token_Collection::ACE_Token_Collection (bool debug,
diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp
index 4d664c02b2f..e8a6d03684d 100644
--- a/ACE/ace/Token_Invariants.cpp
+++ b/ACE/ace/Token_Invariants.cpp
@@ -35,7 +35,7 @@ ACE_Token_Invariant_Manager::instance (void)
   return instance_;
 }
 
-ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void)
+ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager ()
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager");
 }
@@ -225,13 +225,8 @@ ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void)
 // **************************************************
 // **************************************************
 
-ACE_Mutex_Invariants::ACE_Mutex_Invariants (void)
-: owners_ (0)
-{
-}
-
 int
-ACE_Mutex_Invariants::acquired (void)
+ACE_Mutex_Invariants::acquired ()
 {
   if (++owners_ > 1)
     {
@@ -243,23 +238,12 @@ ACE_Mutex_Invariants::acquired (void)
 }
 
 void
-ACE_Mutex_Invariants::releasing (void)
+ACE_Mutex_Invariants::releasing ()
 {
   if (owners_ == 1)
     --owners_;
 }
 
-ACE_Mutex_Invariants::ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs)
-: owners_ (rhs.owners_)
-{
-}
-
-void
-ACE_Mutex_Invariants::operator= (const ACE_Mutex_Invariants &rhs)
-{
-  owners_ = rhs.owners_;
-}
-
 void
 ACE_Mutex_Invariants::dump (void) const
 {
@@ -272,14 +256,6 @@ ACE_Mutex_Invariants::dump (void) const
 }
 
 // **************************************************
-// **************************************************
-// **************************************************
-
-ACE_RWLock_Invariants::ACE_RWLock_Invariants (void)
-: writers_ (0),
-  readers_ (0)
-{
-}
 
 int
 ACE_RWLock_Invariants::writer_acquired (void)
@@ -322,19 +298,6 @@ ACE_RWLock_Invariants::releasing (void)
     --readers_;
 }
 
-ACE_RWLock_Invariants::ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs)
-: writers_ (rhs.writers_),
-  readers_ (rhs.readers_)
-{
-}
-
-void
-ACE_RWLock_Invariants::operator= (const ACE_RWLock_Invariants &rhs)
-{
-  writers_ = rhs.writers_;
-  readers_ = rhs.readers_;
-}
-
 void
 ACE_RWLock_Invariants::dump (void) const
 {
diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h
index 78603ced6a0..209fb1c32a9 100644
--- a/ACE/ace/Token_Invariants.h
+++ b/ACE/ace/Token_Invariants.h
@@ -41,29 +41,29 @@ class ACE_Export ACE_Mutex_Invariants
 {
 public:
   /// Default construction.
-  ACE_Mutex_Invariants (void);
+  ACE_Mutex_Invariants () = default;
 
   /// Returns 1 on success, 0 when an invariant has been violated and
   /// -1 on error.
-  int acquired (void);
+  int acquired ();
 
   /// Updates internal database.
-  void releasing (void);
+  void releasing ();
 
   // = Map_Manager operations.
 
   /// Copy construction.
-  ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs);
+  ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs) = default;
 
   /// Copy.
-  void operator= (const ACE_Mutex_Invariants &rhs);
+  void operator= (const ACE_Mutex_Invariants &rhs) = default;
 
   /// Dump the state of the class.
   void dump () const;
 
 private:
   /// Number of owners.  This had better be 0 >= owners_ <= 1;
-  int owners_;
+  int owners_ {};
 };
 
 /**
@@ -79,36 +79,36 @@ class ACE_Export ACE_RWLock_Invariants
 {
 public:
   /// Default construction.
-  ACE_RWLock_Invariants (void);
+  ACE_RWLock_Invariants () = default;
 
   /// Returns 1 on success, 0 when an invariant has been violated and
   /// -1 on error.
-  int writer_acquired (void);
+  int writer_acquired ();
 
   /// Returns 1 on success, 0 when an invariant has been violated and
   /// -1 on error.
-  int reader_acquired (void);
+  int reader_acquired ();
 
   /// Updates internal database.
-  void releasing (void);
+  void releasing ();
 
   // = Map_Manager operations.
 
   /// Copy construction.
-  ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs);
+  ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs) = default;
 
   /// Copy.
-  void operator= (const ACE_RWLock_Invariants &rhs);
+  void operator= (const ACE_RWLock_Invariants &rhs) = default;
 
   /// Dump the state of the class.
   void dump () const;
 
 private:
   /// Number of owning writers.
-  int writers_;
+  int writers_ {};
 
   /// Number of owning readers.
-  int readers_;
+  int readers_ {};
 };
 
 /**
diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp
index 3df3541ef9c..8737e7576bb 100644
--- a/ACE/ace/Token_Request_Reply.cpp
+++ b/ACE/ace/Token_Request_Reply.cpp
@@ -6,12 +6,9 @@
 #include "ace/Token_Request_Reply.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default "do nothing" constructor.
-
 ACE_Token_Request::ACE_Token_Request (void)
   : token_name_ (0),
     client_id_ (0)
diff --git a/ACE/ace/Token_Request_Reply.h b/ACE/ace/Token_Request_Reply.h
index 85987ff3861..7452648809c 100644
--- a/ACE/ace/Token_Request_Reply.h
+++ b/ACE/ace/Token_Request_Reply.h
@@ -58,7 +58,7 @@ public:
   };
 
   /// Default constructor.
-  ACE_Token_Request (void);
+  ACE_Token_Request ();
 
   /**
    * @param token_type MUTEX, RWLOCK
@@ -76,45 +76,45 @@ public:
                      const ACE_Synch_Options &options);
 
   /// Get the length of the encoded/decoded message.
-  ACE_UINT32 length (void) const;
+  ACE_UINT32 length () const;
 
   /// Set the length of the encoded/decoded message.
   void length (ACE_UINT32);
 
   /// Get the type of proxy
-  int proxy_type (void) const;
+  int proxy_type () const;
 
   /// Set the type of proxy
   void proxy_type (int proxy_type);
 
   /// Get the type of token
-  int token_type (void) const;
+  int token_type () const;
 
   /// Set the type of token
   void token_type (int token_type);
 
   /// Get the type of the operation.
-  ACE_UINT32 operation_type (void) const;
+  ACE_UINT32 operation_type () const;
 
   /// Set the type of the operation.
   void operation_type (ACE_UINT32);
 
   /// Get the requeue position.  These should be used when renew
   /// is the operation type.
-  ACE_UINT32 requeue_position (void) const;
+  ACE_UINT32 requeue_position () const;
 
   /// Set the requeue position.  These should be used when renew
   /// is the operation type.
   void requeue_position (ACE_UINT32);
 
   /// Get notify.  These should be used when acquire is the operation type.
-  ACE_UINT32 notify (void) const;
+  ACE_UINT32 notify () const;
 
   /// Set notify.  These should be used when acquire is the operation type.
   void notify (ACE_UINT32);
 
   /// Get the timeout.
-  ACE_Synch_Options &options (void) const;
+  ACE_Synch_Options &options () const;
 
   /// Set the timeout.
   void options (const ACE_Synch_Options &options);
@@ -122,8 +122,8 @@ public:
   // = Set/get the name of the token and the client id.  The set
   // method is combined to make it easier on us.  We're copying the
   // names as a contiguous buffer.
-  ACE_TCHAR *token_name (void) const;
-  ACE_TCHAR *client_id (void) const;
+  ACE_TCHAR *token_name () const;
+  ACE_TCHAR *client_id () const;
   void token_name (const ACE_TCHAR *token_name, const ACE_TCHAR *client_id);
 
   /// Encode the message before transmission.
@@ -131,7 +131,7 @@ public:
 
   /// Decode message after reception.  This must be called to set the
   /// internal options.
-  int decode (void);
+  int decode ();
 
   /// Print out the values of the message for debugging purposes.
   void dump () const;
@@ -204,22 +204,22 @@ class ACE_Export ACE_Token_Reply
 {
 public:
   /// Default constructor.
-  ACE_Token_Reply (void);
+  ACE_Token_Reply ();
 
   /// Get the length of the encoded/decoded message.
-  ACE_UINT32 length (void) const;
+  ACE_UINT32 length () const;
 
   /// Set the length of the encoded/decoded message.
   void length (ACE_UINT32);
 
   /// Get the errno of a reply.
-  ACE_UINT32 errnum (void) const;
+  ACE_UINT32 errnum () const;
 
   /// Set the errno of a reply.
   void errnum (ACE_UINT32);
 
   /// Get the arg of a reply.
-  ACE_UINT32 arg (void) const;
+  ACE_UINT32 arg () const;
 
   /// Set the arg of a reply.
   void arg (ACE_UINT32);
@@ -228,14 +228,13 @@ public:
   int encode (void *&);
 
   /// Decode a message after reception.
-  int decode (void);
+  int decode ();
 
   /// Print out the values of the message for debugging purposes.
   void dump () const;
 
 private:
-  // = The 2 fields in the <Transfer> struct are transmitted to the server.
-
+  /// The 2 fields in the <Transfer> struct are transmitted to the server.
   struct Transfer
   {
     /// Length of entire reply.
@@ -251,7 +250,6 @@ private:
 
     /// magic cookie
     ACE_UINT32 arg_;
-
   } transfer_;
 };
 
diff --git a/ACE/ace/UNIX_Addr.cpp b/ACE/ace/UNIX_Addr.cpp
index bae284b79ca..d75c227c3e2 100644
--- a/ACE/ace/UNIX_Addr.cpp
+++ b/ACE/ace/UNIX_Addr.cpp
@@ -1,7 +1,5 @@
 #include "ace/UNIX_Addr.h"
 
-
-
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #if defined (ACE_HAS_ALLOC_HOOKS)
diff --git a/ACE/ace/UNIX_Addr.h b/ACE/ace/UNIX_Addr.h
index 255832d51b3..fed5df7fab6 100644
--- a/ACE/ace/UNIX_Addr.h
+++ b/ACE/ace/UNIX_Addr.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_UNIX_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_UNIX_Addr (void);
+  ACE_UNIX_Addr ();
 
   /// Copy constructor.
   ACE_UNIX_Addr (const ACE_UNIX_Addr &sa);
@@ -59,7 +59,7 @@ public:
   int set (const sockaddr_un *, int len);
 
   /// Return a pointer to the underlying network address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Set a pointer to the underlying network address.
   virtual void set_addr (const void *addr, int len);
@@ -85,10 +85,10 @@ public:
   bool operator != (const ACE_UNIX_Addr &SAP) const;
 
   /// Return the path name of the underlying rendezvous point.
-  const char *get_path_name (void) const;
+  const char *get_path_name () const;
 
   /// Computes and returns hash value.
-  virtual u_long hash (void) const;
+  virtual u_long hash () const;
 
   /// Dump the state of an object.
   void dump () const;
diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp
index 33d62eab73a..686fad0c811 100644
--- a/ACE/ace/UPIPE_Acceptor.cpp
+++ b/ACE/ace/UPIPE_Acceptor.cpp
@@ -1,7 +1,5 @@
 #include "ace/UPIPE_Acceptor.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/OS_NS_unistd.h"
@@ -36,7 +34,6 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor ()
 }
 
 // General purpose routine for performing server ACE_UPIPE.
-
 int
 ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr,
                           int reuse_addr)
@@ -53,7 +50,6 @@ ACE_UPIPE_Acceptor::close ()
 }
 
 // General purpose routine for accepting new connections.
-
 ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr,
                                         int reuse_addr)
   : mb_ (sizeof (ACE_UPIPE_Stream *))
diff --git a/ACE/ace/UPIPE_Acceptor.h b/ACE/ace/UPIPE_Acceptor.h
index 6516ba45339..14f824ab924 100644
--- a/ACE/ace/UPIPE_Acceptor.h
+++ b/ACE/ace/UPIPE_Acceptor.h
@@ -37,7 +37,7 @@ class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor
 {
 public:
   /// Default constructor.
-  ACE_UPIPE_Acceptor (void);
+  ACE_UPIPE_Acceptor ();
 
   /// Initialize passive endpoint.
   ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap,
@@ -48,14 +48,14 @@ public:
             int reuse_addr = 0);
 
   /// Close down and release resources.
-  ~ACE_UPIPE_Acceptor (void);
+  ~ACE_UPIPE_Acceptor ();
 
   /// Close down and release resources.
-  int close (void);
+  int close ();
 
   /// Close down and release resources and remove the underlying SPIPE
   /// rendezvous point.
-  int remove (void);
+  int remove ();
 
   // = Passive connection acceptance method.
   /**
diff --git a/ACE/ace/UPIPE_Connector.cpp b/ACE/ace/UPIPE_Connector.cpp
index 48d854d7cd4..03c61ea5999 100644
--- a/ACE/ace/UPIPE_Connector.cpp
+++ b/ACE/ace/UPIPE_Connector.cpp
@@ -1,7 +1,5 @@
 #include "ace/UPIPE_Connector.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/Handle_Ops.h"
diff --git a/ACE/ace/UPIPE_Stream.cpp b/ACE/ace/UPIPE_Stream.cpp
index 69c7e6e3733..49c1fa24d51 100644
--- a/ACE/ace/UPIPE_Stream.cpp
+++ b/ACE/ace/UPIPE_Stream.cpp
@@ -1,7 +1,5 @@
 #include "ace/UPIPE_Stream.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/OS_NS_string.h"
diff --git a/ACE/ace/UTF8_Encoding_Converter.h b/ACE/ace/UTF8_Encoding_Converter.h
index 3cca2f41d15..fbb96c3d559 100644
--- a/ACE/ace/UTF8_Encoding_Converter.h
+++ b/ACE/ace/UTF8_Encoding_Converter.h
@@ -29,10 +29,10 @@ class ACE_UTF8_Encoding_Converter: public ACE_Encoding_Converter
 public:
   /// Allocate the converter to be used by the from_utf8() method based
   /// on the size of the native wide character.
-  ACE_UTF8_Encoding_Converter (void);
+  ACE_UTF8_Encoding_Converter ();
 
   /// De-allocate the native converter.
-  virtual ~ACE_UTF8_Encoding_Converter (void);
+  virtual ~ACE_UTF8_Encoding_Converter ();
 
   /// Since the source *must be* UTF-8, there is no conversion required.
   /// This method just copies the source to the target given that there
diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h
index 172f0b84319..f0773b44ccc 100644
--- a/ACE/ace/Unbounded_Queue.h
+++ b/ACE/ace/Unbounded_Queue.h
@@ -157,7 +157,7 @@ public:
   /**
    * Initialize an empty queue using the strategy provided.
    */
-  ACE_Unbounded_Queue (ACE_Allocator *alloc = 0);
+  ACE_Unbounded_Queue (ACE_Allocator *alloc = nullptr);
 
   /// Copy constructor.
   /**
diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h
index 56dc0fbdedd..2fc19a24a3e 100644
--- a/ACE/ace/Unbounded_Set.h
+++ b/ACE/ace/Unbounded_Set.h
@@ -77,7 +77,7 @@ class ACE_Unbounded_Set : public
   ACE_Unbounded_Set_Ex<T, ACE_Unbounded_Set_Default_Comparator<T> >
 {
 public:
-  ACE_Unbounded_Set (ACE_Allocator *alloc = 0);
+  ACE_Unbounded_Set (ACE_Allocator *alloc = nullptr);
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h
index c59c1ec81ae..6b289c0a415 100644
--- a/ACE/ace/Unbounded_Set_Ex.h
+++ b/ACE/ace/Unbounded_Set_Ex.h
@@ -234,13 +234,13 @@ public:
    * Initialize an empty set using the allocation strategy of the user if
    * provided.
    */
-  ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = 0);
+  ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = nullptr);
 
   /**
    * Initialize an empty set using the allocation strategy of the user if
    * provided, and a given comparator functor.
    */
-  ACE_Unbounded_Set_Ex (const C &comparator, ACE_Allocator *alloc = 0);
+  ACE_Unbounded_Set_Ex (const C &comparator, ACE_Allocator *alloc = nullptr);
 
   /// Copy constructor.
   /**
diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h
index f099bd6ebac..2f558b98c15 100644
--- a/ACE/ace/Value_Ptr.h
+++ b/ACE/ace/Value_Ptr.h
@@ -65,9 +65,8 @@ namespace ACE
   class Value_Ptr
   {
   public:
-
     /// Constructor.
-    explicit Value_Ptr (T * p = 0) : p_ (p) { }
+    explicit Value_Ptr (T * p = 0) : p_ (p) {}
 
     /// Destructor.
     ~Value_Ptr () { delete this->p_; }
@@ -117,7 +116,6 @@ namespace ACE
     }
 
   private:
-
     /// Copying method invoked when copy constructing.
     template <typename U>
     T * create_from (U const * p) const
@@ -130,7 +128,6 @@ namespace ACE
 
     /// Object owned by this @c Value_Ptr.
     T * p_;
-
   };
 
 }
diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h
index e132dd9851c..4734ea8c0e5 100644
--- a/ACE/ace/Vector_T.h
+++ b/ACE/ace/Vector_T.h
@@ -88,7 +88,7 @@ public:
   /**
    * Destructor.
    */
-  ~ACE_Vector ();
+  ~ACE_Vector () = default;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl
index 9079375a5d6..8ed7d5c1a2a 100644
--- a/ACE/ace/Vector_T.inl
+++ b/ACE/ace/Vector_T.inl
@@ -13,11 +13,6 @@ ACE_Vector<T, DEFAULT_SIZE>::ACE_Vector (const size_t init_size,
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
-ACE_Vector<T, DEFAULT_SIZE>::~ACE_Vector ()
-{
-}
-
-template <class T, size_t DEFAULT_SIZE> ACE_INLINE
 size_t ACE_Vector<T, DEFAULT_SIZE>::capacity () const
 {
   return curr_max_size_;
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index fb778aba0cf..0c1d5dab885 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -188,10 +188,10 @@ public:
     bool suspend_entry_;
 
     /// Default constructor
-    Current_Info (void);
+    Current_Info ();
 
     /// Reset the state of the structure
-    void reset (void);
+    void reset ();
 
     /// Set the structure to these new values
     void set (bool io_entry,
@@ -227,10 +227,10 @@ public:
     bool suspend_entry_;
 
     /// Default constructor
-    To_Be_Added_Info (void);
+    To_Be_Added_Info ();
 
     /// Reset the state of the structure
-    void reset (void);
+    void reset ();
 
     /// Set the structure to these new values
     void set (ACE_HANDLE event_handle,
@@ -268,10 +268,10 @@ public:
     bool resume_entry_;
 
     /// Constructor used for initializing the structure
-    Suspended_Info (void);
+    Suspended_Info ();
 
     /// Reset the state of the structure
-    void reset (void);
+    void reset ();
 
     /// Set the structure to these new values
     void set (ACE_HANDLE event_handle,
@@ -1343,9 +1343,8 @@ protected:
   sig_atomic_t deactivated_;
 
 private:
-  /// Deny access since member-wise won't work...
-  ACE_WFMO_Reactor (const ACE_WFMO_Reactor &);
-  ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &);
+  ACE_WFMO_Reactor (const ACE_WFMO_Reactor &) = delete;
+  ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/WIN32_Proactor.h b/ACE/ace/WIN32_Proactor.h
index e370ee08ddc..8ce6d744c25 100644
--- a/ACE/ace/WIN32_Proactor.h
+++ b/ACE/ace/WIN32_Proactor.h
@@ -57,10 +57,10 @@ public:
                       bool used_with_reactor_event_loop = false);
 
   /// Virtual destruction.
-  virtual ~ACE_WIN32_Proactor (void);
+  virtual ~ACE_WIN32_Proactor ();
 
   /// Close the IO completion port.
-  virtual int close (void);
+  virtual int close ();
 
   /// This method adds the @a handle to the I/O completion port. This
   /// function is a no-op function for Unix systems.
@@ -81,7 +81,7 @@ public:
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
-  virtual int handle_events (void);
+  virtual int handle_events ();
 
   /**
    * Post a result to the completion port of the Proactor.  If errors
@@ -94,13 +94,13 @@ public:
   virtual int post_completion (ACE_WIN32_Asynch_Result *result);
 
   /// Add wakeup dispatch threads (reinit).
-  int wake_up_dispatch_threads (void);
+  int wake_up_dispatch_threads ();
 
   /// Close all dispatch threads.
   int close_dispatch_threads (int wait);
 
   /// Get number of thread used as a parameter to @c CreateIoCompletionPort.
-  size_t number_of_threads (void) const;
+  size_t number_of_threads () const;
 
   /// Set number of thread used as a parameter to @c CreateIoCompletionPort.
   void number_of_threads (size_t threads);
@@ -108,15 +108,15 @@ public:
   /// Get the event handle.
   virtual ACE_HANDLE get_handle (void) const;
 
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
-  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
-  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
-  virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void);
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
+  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream ();
+  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream ();
+  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file ();
+  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file ();
+  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram ();
+  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram ();
+  virtual ACE_Asynch_Accept_Impl *create_asynch_accept ();
+  virtual ACE_Asynch_Connect_Impl *create_asynch_connect ();
+  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file ();
 
   // Methods used to create Asynch_IO_Result objects. We create the right
   // objects here in these methods.
@@ -227,7 +227,7 @@ public:
 
 protected:
   /// Task to process pseudo-asynchronous operations
-  ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task (void);
+  ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task ();
 
   /// Called when object is signaled by OS (either via UNIX signals or
   /// when a Win32 object becomes signaled).
diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp
index 44da82975ac..0e1ef23299b 100644
--- a/ACE/ace/XTI_ATM_Mcast.cpp
+++ b/ACE/ace/XTI_ATM_Mcast.cpp
@@ -1,7 +1,5 @@
 #include "ace/XTI_ATM_Mcast.h"
 
-
-
 #if defined (ACE_HAS_XTI_ATM)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h
index 06d8eeb2b5a..106f73a66e9 100644
--- a/ACE/ace/config-all.h
+++ b/ACE/ace/config-all.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-all.h
  *
- *  @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu>
+ *  @author Doug Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
  */
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h
index 27a63cf6ca9..50b4398b706 100644
--- a/ACE/ace/config-lite.h
+++ b/ACE/ace/config-lite.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-lite.h
  *
- *  @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu>
+ *  @author Doug Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
  *
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 498e7bbe951..1a2bcbaad48 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-macros.h
  *
- *  @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu>
+ *  @author Doug Schmidt <d.schmidt@vanderbilt.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
  *  @author and a cast of thousands...
  *
diff --git a/ACE/tests/New_Fail_Test.cpp b/ACE/tests/New_Fail_Test.cpp
index 5e1a5921802..5385028bbe9 100644
--- a/ACE/tests/New_Fail_Test.cpp
+++ b/ACE/tests/New_Fail_Test.cpp
@@ -34,7 +34,7 @@
 
 // Most we can do, by half. Using max alone gets "invalid allocation size"
 // messages on stdout on Windows.
-static const size_t BIG_BLOCK = ACE_Numeric_Limits<size_t>::max () / 2;
+static const size_t BIG_BLOCK = ACE_Numeric_Limits<size_t>::max () / 3;
 
 // Shouldn't take many "as much as possible" tries to get a failure.
 static const int MAX_ALLOCS_IN_TEST = 4;
@@ -49,15 +49,15 @@ try_ace_new (char **p)
 static char *
 try_ace_new_return ()
 {
-  char *p = 0;
-  ACE_NEW_RETURN (p, char[BIG_BLOCK], 0);
+  char *p = nullptr;
+  ACE_NEW_RETURN (p, char[BIG_BLOCK], nullptr);
   return p;
 }
 
 static char *
 try_ace_new_noreturn ()
 {
-  char *p = 0;
+  char *p = nullptr;
   ACE_NEW_NORETURN (p, char[BIG_BLOCK]);
   return p;
 }
diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp
index 84f61e6ff43..5bfb4207632 100644
--- a/ACE/tests/Notify_Performance_Test.cpp
+++ b/ACE/tests/Notify_Performance_Test.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    Notify_Performance_Test.cpp
@@ -12,7 +11,6 @@
  */
 //=============================================================================
 
-
 #include <utility>
 
 #include "test_config.h"
@@ -26,8 +24,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Atomic_Op.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 
 // Number of client (user) threads