Merge pull request #1761 from jwillemsen/jwi-defaultoverride

Make use of C++ default/override

37 files changed, 60 insertions, 126 deletions

diff --git a/ACE/ace/Log_Msg_Android_Logcat.cpp b/ACE/ace/Log_Msg_Android_Logcat.cpp
index 2985965136c..1bdba36db15 100644
--- a/ACE/ace/Log_Msg_Android_Logcat.cpp
+++ b/ACE/ace/Log_Msg_Android_Logcat.cpp
@@ -39,11 +39,7 @@ convert_log_priority (ACE_Log_Priority lm_priority)
   }
 }
 
-ACE_Log_Msg_Android_Logcat::ACE_Log_Msg_Android_Logcat ()
-{
-}
-
-ACE_Log_Msg_Android_Logcat::~ACE_Log_Msg_Android_Logcat (void)
+ACE_Log_Msg_Android_Logcat::~ACE_Log_Msg_Android_Logcat ()
 {
   this->close ();
 }
@@ -55,13 +51,13 @@ ACE_Log_Msg_Android_Logcat::open (const ACE_TCHAR *)
 }
 
 int
-ACE_Log_Msg_Android_Logcat::reset (void)
+ACE_Log_Msg_Android_Logcat::reset ()
 {
   return close ();
 }
 
 int
-ACE_Log_Msg_Android_Logcat::close (void)
+ACE_Log_Msg_Android_Logcat::close ()
 {
   return 0;
 }
diff --git a/ACE/ace/Log_Msg_Android_Logcat.h b/ACE/ace/Log_Msg_Android_Logcat.h
index 8eb9c266272..21ed5cfb7d7 100644
--- a/ACE/ace/Log_Msg_Android_Logcat.h
+++ b/ACE/ace/Log_Msg_Android_Logcat.h
@@ -35,20 +35,20 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Log_Msg_Android_Logcat : public ACE_Log_Msg_Backend
 {
 public:
-  ACE_Log_Msg_Android_Logcat ();
-  virtual ~ACE_Log_Msg_Android_Logcat ();
+  ACE_Log_Msg_Android_Logcat () = default;
+  ~ACE_Log_Msg_Android_Logcat () override;
 
   /// Initialize the event logging facility. NOP in this class.
-  virtual int open (const ACE_TCHAR *);
+  int open (const ACE_TCHAR *) override;
 
   /// Reset the backend. NOP in this class.
-  virtual int reset ();
+  int reset () override;
 
   /// Close the backend completely. NOP in this class.
-  virtual int close ();
+  int close () override;
 
   /// This is called when we want to log a message.
-  virtual ssize_t log (ACE_Log_Record &log_record);
+  ssize_t log (ACE_Log_Record &log_record) override;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Log_Msg_Backend.cpp b/ACE/ace/Log_Msg_Backend.cpp
index 8d3dbe699b1..0cdad7eb6d3 100644
--- a/ACE/ace/Log_Msg_Backend.cpp
+++ b/ACE/ace/Log_Msg_Backend.cpp
@@ -1,8 +1,5 @@
 #include "ace/Log_Msg_Backend.h"
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend ()
diff --git a/ACE/ace/Log_Msg_Backend.h b/ACE/ace/Log_Msg_Backend.h
index 87b42f69b5c..a003f70cb62 100644
--- a/ACE/ace/Log_Msg_Backend.h
+++ b/ACE/ace/Log_Msg_Backend.h
@@ -40,7 +40,7 @@ class ACE_Export ACE_Log_Msg_Backend
 {
 public:
   /// No-op virtual destructor.
-  virtual ~ACE_Log_Msg_Backend (void);
+  virtual ~ACE_Log_Msg_Backend ();
 
   /**
    * Open the back end object. Perform any actions needed to prepare
@@ -64,10 +64,10 @@ public:
    * @retval Currently ignored, but to be safe, return 0 for success;
    *         -1 for failure.
    */
-  virtual int reset (void) = 0;
+  virtual int reset () = 0;
 
   /// Close the backend completely.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Process a log record.
diff --git a/ACE/ace/Log_Msg_Callback.cpp b/ACE/ace/Log_Msg_Callback.cpp
index b88de627c63..d86575567a8 100644
--- a/ACE/ace/Log_Msg_Callback.cpp
+++ b/ACE/ace/Log_Msg_Callback.cpp
@@ -2,10 +2,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_Callback::ACE_Log_Msg_Callback ()
-{
-}
-
 ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback ()
 {
 }
diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h
index f61587013ee..812c2c7ecda 100644
--- a/ACE/ace/Log_Msg_Callback.h
+++ b/ACE/ace/Log_Msg_Callback.h
@@ -53,10 +53,10 @@ class ACE_Export ACE_Log_Msg_Callback
 {
 public:
   /// Default constructor
-  ACE_Log_Msg_Callback (void);
+  ACE_Log_Msg_Callback () = default;
 
   /// No-op virtual destructor.
-  virtual ~ACE_Log_Msg_Callback (void);
+  virtual ~ACE_Log_Msg_Callback ();
 
   /// Callback routine.  This is called when we want to log a message.
   /// Since this routine is pure virtual, it must be overwritten by the
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index e484ef91451..f3454de5006 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -5,10 +5,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_IPC::ACE_Log_Msg_IPC ()
-{
-}
-
 ACE_Log_Msg_IPC::~ACE_Log_Msg_IPC ()
 {
   (void) this->close ();
diff --git a/ACE/ace/Log_Msg_IPC.h b/ACE/ace/Log_Msg_IPC.h
index 1dad164bdc7..b38d010aa8b 100644
--- a/ACE/ace/Log_Msg_IPC.h
+++ b/ACE/ace/Log_Msg_IPC.h
@@ -50,13 +50,13 @@ class ACE_Export ACE_Log_Msg_IPC : public ACE_Log_Msg_Backend
 {
 public:
   /// Constructor
-  ACE_Log_Msg_IPC (void);
+  ACE_Log_Msg_IPC () = default;
 
   /// Destructor
-  virtual ~ACE_Log_Msg_IPC (void);
+  ~ACE_Log_Msg_IPC () override;
 
   /// Open a new connection
-  virtual int open (const ACE_TCHAR *logger_key);
+  int open (const ACE_TCHAR *logger_key) override;
 
   /**
    * Reset the backend.  When changing the logging destination the
@@ -64,10 +64,10 @@ public:
    * daemon and reclaim some local resources.  But we try to reduce
    * the number of local allocations/deallocations.
    */
-  virtual int reset (void);
+  int reset () override;
 
-  virtual int close (void);
-  virtual ssize_t log (ACE_Log_Record &log_record);
+  int close () override;
+  ssize_t log (ACE_Log_Record &log_record) override;
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp
index 29a8cd05afa..2614600d7bc 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp
@@ -10,12 +10,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_NT_Event_Log::ACE_Log_Msg_NT_Event_Log (void)
-  : evlog_handle_(0)
-{
-}
-
-ACE_Log_Msg_NT_Event_Log::~ACE_Log_Msg_NT_Event_Log (void)
+ACE_Log_Msg_NT_Event_Log::~ACE_Log_Msg_NT_Event_Log ()
 {
   this->close ();
 }
@@ -77,13 +72,13 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
 }
 
 int
-ACE_Log_Msg_NT_Event_Log::reset (void)
+ACE_Log_Msg_NT_Event_Log::reset ()
 {
   return this->close ();
 }
 
 int
-ACE_Log_Msg_NT_Event_Log::close (void)
+ACE_Log_Msg_NT_Event_Log::close ()
 {
   if (this->evlog_handle_ == 0
       || DeregisterEventSource (this->evlog_handle_))
diff --git a/ACE/ace/Log_Msg_NT_Event_Log.h b/ACE/ace/Log_Msg_NT_Event_Log.h
index d234923a54b..a91fbab4457 100644
--- a/ACE/ace/Log_Msg_NT_Event_Log.h
+++ b/ACE/ace/Log_Msg_NT_Event_Log.h
@@ -34,10 +34,10 @@ class ACE_Export ACE_Log_Msg_NT_Event_Log : public ACE_Log_Msg_Backend
 {
 public:
   /// Constructor
-  ACE_Log_Msg_NT_Event_Log (void);
+  ACE_Log_Msg_NT_Event_Log () = default;
 
   /// Destructor
-  virtual ~ACE_Log_Msg_NT_Event_Log (void);
+  ~ACE_Log_Msg_NT_Event_Log () override;
 
   /// Open a new event log.
   /**
@@ -47,19 +47,19 @@ public:
    *                   it is 0 (no name), the application name as
    *                   returned from ACE_Log_Msg::program_name() is used.
    */
-  virtual int open (const ACE_TCHAR *logger_key);
+  int open (const ACE_TCHAR *logger_key) override;
 
   /// Reset the backend.
-  virtual int reset (void);
+  int reset (void) override;
 
   /// Close the backend completely.
-  virtual int close (void);
+  int close (void) override;
 
   /// This is called when we want to log a message.
-  virtual ssize_t log (ACE_Log_Record &log_record);
+  ssize_t log (ACE_Log_Record &log_record) override;
 
 private:
-  HANDLE evlog_handle_;
+  HANDLE evlog_handle_ {0};
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.cpp b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
index 73c9403d096..aaaec35abcc 100644
--- a/ACE/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
@@ -22,10 +22,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 //   should not be too limiting, as the ACE_Log_Msg class itself can
 //   be used to control thread specific logging behavior.
 
-ACE_Log_Msg_UNIX_Syslog::ACE_Log_Msg_UNIX_Syslog ()
-{
-}
-
 ACE_Log_Msg_UNIX_Syslog::~ACE_Log_Msg_UNIX_Syslog ()
 {
   (void) this->close ();
diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.h b/ACE/ace/Log_Msg_UNIX_Syslog.h
index c870d07e81e..7e7b6be182e 100644
--- a/ACE/ace/Log_Msg_UNIX_Syslog.h
+++ b/ACE/ace/Log_Msg_UNIX_Syslog.h
@@ -35,10 +35,10 @@ class ACE_Export ACE_Log_Msg_UNIX_Syslog : public ACE_Log_Msg_Backend
 {
 public:
   /// Constructor
-  ACE_Log_Msg_UNIX_Syslog (void);
+  ACE_Log_Msg_UNIX_Syslog () = default;
 
   /// Destructor
-  virtual ~ACE_Log_Msg_UNIX_Syslog (void);
+  virtual ~ACE_Log_Msg_UNIX_Syslog ();
 
   /// Open a new event log.
   /**
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 8273695fffd..aac5767ffc2 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -244,7 +244,7 @@ namespace TAO
   void
   Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr)
   {
-    if (! this->demarshal_value (cdr))
+    if (!this->demarshal_value (cdr))
       {
         throw ::CORBA::MARSHAL ();
       }
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
index 59a5ead3ebc..4ce03c5bd2c 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
@@ -39,7 +39,6 @@ class TAO_Messaging_Export TAO_AMI_Arguments_Converter_Impl
   : public TAO::Collocated_Arguments_Converter
 {
 public:
-
   virtual void convert_request (TAO_ServerRequest & server_request,
                                 TAO::Argument * const args[],
                                 size_t nargs);
@@ -65,13 +64,11 @@ static int
 TAO_Requires_AMI_Arguments_Converter_Impl_Initializer =
   TAO_AMI_Arguments_Converter_Impl::Initializer ();
 
-
 ACE_STATIC_SVC_DECLARE (TAO_AMI_Arguments_Converter_Impl)
 ACE_FACTORY_DECLARE (TAO_Messaging, TAO_AMI_Arguments_Converter_Impl)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_AMI_ARGUMENTS_CONVERTER_IMPL_H */
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index a85a96033e8..7fad8db98bc 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -22,11 +22,6 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
 {
 }
 
-// Destructor.
-TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher ()
-{
-}
-
 // Dispatch the reply.
 int
 TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index b824cacc50d..2ae0d89c582 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -39,7 +39,7 @@ public:
       ACE_Allocator *allocator);
 
   /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher ();
+  virtual ~TAO_Asynch_Reply_Dispatcher () = default;
 
   /// @name The Reply Dispatcher methods
   //@{
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index 3b9da61a265..aec430f3560 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -18,11 +18,6 @@ TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
     ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
-TAO_Asynch_Timeout_Handler::~TAO_Asynch_Timeout_Handler ()
-{
-}
-
-
 long
 TAO_Asynch_Timeout_Handler::schedule_timer (TAO_Transport_Mux_Strategy *tms,
                                             CORBA::ULong request_id,
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
index ff43d74c2ff..be3c9bb2e6f 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
@@ -42,7 +42,7 @@ class TAO_Asynch_Timeout_Handler
 public:
   TAO_Asynch_Timeout_Handler (ACE_Reactor *reactor);
 
-  ~TAO_Asynch_Timeout_Handler ();
+  ~TAO_Asynch_Timeout_Handler () = default;
 
   /// Schedule a timer
   long schedule_timer (TAO_Transport_Mux_Strategy *tms,
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index 4b17c72cfa3..d77293d13a0 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -18,8 +18,7 @@ TAO_Messaging_Loader::~TAO_Messaging_Loader ()
 }
 
 int
-TAO_Messaging_Loader::init (int,
-                            ACE_TCHAR* [])
+TAO_Messaging_Loader::init (int, ACE_TCHAR* [])
 {
   ACE_TRACE ("TAO_Messaging_Loader::init");
 
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
index aab9fc1efe2..bab3dbbe6e8 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
@@ -45,16 +45,16 @@ namespace TAO
   class Eager_Transport_Queueing_Strategy : public Transport_Queueing_Strategy
   {
   public:
-    virtual bool must_queue (bool queue_empty) const;
+    bool must_queue (bool queue_empty) const override;
 
-    virtual bool buffering_constraints_reached (
+    bool buffering_constraints_reached (
       TAO_Stub *stub,
       size_t msg_count,
       size_t total_bytes,
       bool &must_flush,
       const ACE_Time_Value &current_deadline,
       bool &set_timer,
-      ACE_Time_Value &new_deadline) const;
+      ACE_Time_Value &new_deadline) const override;
 
   private:
     /// Check if the buffering constraint includes any timeouts and
@@ -88,7 +88,7 @@ namespace TAO
     : public Eager_Transport_Queueing_Strategy
   {
   public:
-    virtual bool must_queue (bool queue_empty) const;
+    bool must_queue (bool queue_empty) const override;
   };
 
   #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index c77fbe7948c..2e5541c6b78 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -24,7 +24,6 @@ module Messaging
   local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
     readonly attribute TimeBase::TimeT relative_expiry;
   };
-
 };
 
 #endif /*TAO_MESSAGING_RT_POLICY_PIDL*/
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index c968219535f..b1ce49f7071 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -51,10 +51,6 @@ CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy,
 {
 }
 
-CORBA::AbstractBase::~AbstractBase (void)
-{
-}
-
 void
 CORBA::AbstractBase::_add_ref (void)
 {
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index f9825071858..18aeb6430be 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -125,10 +125,9 @@ namespace CORBA
     AbstractBase ();
     AbstractBase (const AbstractBase &);
 
-    virtual ~AbstractBase ();
+    virtual ~AbstractBase () = default;
 
   protected:
-
     CORBA::Boolean is_objref_;
 
   private:
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index 9e4329c0358..8fe77db69d4 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -46,7 +46,7 @@ CORBA::AbstractBase::_stubobj () const
           return this->equivalent_obj_->_stubobj ();
         }
     }
-  return 0;
+  return nullptr;
 }
 
 ACE_INLINE
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index 385d5266499..19bfbb1fb9b 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -1,5 +1,3 @@
-//
-
 #include "tao/Valuetype/Bounded_Valuetype_Sequence_T.h"
 #include "tao/Valuetype/Unbounded_Valuetype_Sequence_T.h"
 
diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
index 42a5224fa53..e080b743554 100644
--- a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
+++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
@@ -31,7 +31,7 @@ struct unbounded_valuetype_allocation_traits
 
   inline static value_type * default_buffer_allocation()
   {
-    return 0;
+    return nullptr;
   }
 
   inline static value_type * allocbuf(CORBA::ULong maximum)
@@ -58,7 +58,7 @@ struct unbounded_valuetype_allocation_traits
 
   inline static void freebuf(value_type * buffer)
   {
-    if(buffer != 0)
+    if(buffer != nullptr)
     {
       value_type * begin = buffer - 1;
       value_type * end = reinterpret_cast<value_type*>(*begin);
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 7189243b08a..cb0c18add1f 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -84,10 +84,6 @@ CORBA::ValueBase::ValueBase (const ValueBase& val)
 {
 }
 
-CORBA::ValueBase::~ValueBase (void)
-{
-}
-
 CORBA::ValueBase*
 CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
 {
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index add847fabef..32eeaed2b3d 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -236,7 +236,7 @@ namespace CORBA
   protected:
     ValueBase ();
     ValueBase (const ValueBase&);
-    virtual ~ValueBase ();
+    virtual ~ValueBase () = default;
 
     /// This flag is set to be true when the valuetype defined
     /// in the idl has the truncatable parent.
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 897f7a40bc7..005a8dadfcf 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -5,12 +5,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
+TAO_ValueFactory_Map::TAO_ValueFactory_Map ()
   : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
 {
 }
 
-TAO_ValueFactory_Map::~TAO_ValueFactory_Map (void)
+TAO_ValueFactory_Map::~TAO_ValueFactory_Map ()
 {
   // Initialize an iterator.  We need to go thru each entry and free
   // up storage allocated to hold the external ids and invoke
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index e2653291683..b604207f16a 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -35,7 +35,6 @@ namespace CORBA
 class TAO_ValueFactory_Map
 {
 public:
-
   TAO_ValueFactory_Map (void);
   ~TAO_ValueFactory_Map (void);
 
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index c136bde51c9..f56c5eb7cc9 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -9,8 +9,8 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (void)
-  : ptr_ (0)
+TAO_Value_Var_T<T>::TAO_Value_Var_T ()
+  : ptr_ (nullptr)
 {}
 
 template <typename T>
@@ -92,14 +92,14 @@ TAO_Value_Var_T<T>::in () const
 
 template <typename T>
 T *&
-TAO_Value_Var_T<T>::inout (void)
+TAO_Value_Var_T<T>::inout ()
 {
   return this->ptr_;
 }
 
 template <typename T>
 T *&
-TAO_Value_Var_T<T>::out (void)
+TAO_Value_Var_T<T>::out ()
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
   this->ptr_ = 0;
@@ -108,7 +108,7 @@ TAO_Value_Var_T<T>::out (void)
 
 template <typename T>
 T *
-TAO_Value_Var_T<T>::_retn (void)
+TAO_Value_Var_T<T>::_retn ()
 {
   T * tmp = this->ptr_;
   this->ptr_ = 0;
@@ -128,7 +128,7 @@ template <typename T>
 TAO_Value_Out_T<T>::TAO_Value_Out_T (T *& p)
   : ptr_ (p)
 {
-  this->ptr_ = 0;
+  this->ptr_ = nullptr;
 }
 
 template <typename T>
@@ -136,7 +136,7 @@ TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p)
   : ptr_ (p.out ())
 {
   TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = 0;
+  this->ptr_ = nullptr;
 }
 
 template <typename T>
@@ -168,14 +168,14 @@ TAO_Value_Out_T<T>::operator T *& ()
 
 template <typename T>
 T *&
-TAO_Value_Out_T<T>::ptr (void)
+TAO_Value_Out_T<T>::ptr ()
 {
   return this->ptr_;
 }
 
 template <typename T>
 T *
-TAO_Value_Out_T<T>::operator-> (void)
+TAO_Value_Out_T<T>::operator-> ()
 {
   return this->ptr_;
 }
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 80223c32b0d..b8f9b2d4dfb 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -7,10 +7,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void)
-{
-}
-
 TAO_Valuetype_Adapter *
 TAO_Valuetype_Adapter_Factory_Impl::create (void)
 {
@@ -22,10 +18,7 @@ TAO_Valuetype_Adapter_Factory_Impl::create (void)
   return nva;
 }
 
-// *********************************************************************
-
 // Initialization and registration of dynamic service object.
-
 int
 TAO_Valuetype_Adapter_Factory_Impl::Initializer (void)
 {
@@ -37,7 +30,6 @@ TAO_Valuetype_Adapter_Factory_Impl::Initializer (void)
         ace_svc_desc_TAO_Valuetype_Adapter_Factory_Impl);
 }
 
-
 ACE_STATIC_SVC_DEFINE (
     TAO_Valuetype_Adapter_Factory_Impl,
     ACE_TEXT ("Concrete_Valuetype_Adapter_Factory"),
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index 0b8ab48fe36..c07d372d800 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -39,7 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl
   : public TAO_Valuetype_Adapter_Factory
 {
 public:
-  virtual ~TAO_Valuetype_Adapter_Factory_Impl ();
+  virtual ~TAO_Valuetype_Adapter_Factory_Impl () = default;
 
   virtual TAO_Valuetype_Adapter * create ();
 
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 3e95c82454f..fce5a351e90 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -9,10 +9,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
-{
-}
-
 CORBA::Object_ptr
 TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
     CORBA::AbstractBase_ptr p)
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index aba0ca95696..201fe5455b6 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -39,8 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl
   : public TAO_Valuetype_Adapter
 {
 public:
-
-  virtual ~TAO_Valuetype_Adapter_Impl (void);
+  virtual ~TAO_Valuetype_Adapter_Impl () = default;
 
   virtual CORBA::Object_ptr abstractbase_to_object (
       CORBA::AbstractBase_ptr);
diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
index 79962ed4da6..b51a05f0770 100644
--- a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h
@@ -55,9 +55,7 @@ public:
   {
   }
 
-  ~valuetype_sequence_element()
-  {
-  }
+  ~valuetype_sequence_element() = default;
 
   valuetype_sequence_element & operator=(
       valuetype_var const & rhs)
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
index 3cffe4e2249..6cceaca1a26 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
@@ -38,7 +38,7 @@ struct valuetype_traits_base
 
   inline static object_type * nil()
   {
-    return 0;
+    return nullptr;
   }
 
   inline static object_type * default_initializer()