6 files changed, 5 insertions, 18 deletions
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index 0d7e481202f..b9ce64774f7 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -40,7 +40,7 @@ class TAO_Export TAO_Cleanup_Func_Registry
 
 public:
   /// Constructor.
-  TAO_Cleanup_Func_Registry ();
+  TAO_Cleanup_Func_Registry () = default;
 
   /// Return the number of registered cleanup functions.
   size_t size () const;
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
index 3fd2e46a546..87f7ab43d12 100644
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ b/TAO/tao/Cleanup_Func_Registry.inl
@@ -1,12 +1,6 @@
 // -*- C++ -*-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE
-TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
-  : cleanup_funcs_ ()
-{
-}
-
 ACE_INLINE size_t
 TAO_Cleanup_Func_Registry::size () const
 {
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index e59d0ee66ee..f651b4fc465 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -56,7 +56,6 @@ namespace Messaging
 class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
 {
 public:
-
   /// Destructor
   virtual ~TAO_Client_Strategy_Factory ();
 
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index dc1f2cda99a..a5cfb657886 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -58,11 +58,9 @@ class TAO_Codeset_Descriptor_Base;
  */
 class TAO_Export TAO_Codeset_Manager
 {
-
 public:
-
   /// Destructor.
-  virtual ~TAO_Codeset_Manager (void);
+  virtual ~TAO_Codeset_Manager ();
 
   /// Called by an object of TAO_Acceptor to set NCS and CCS values for
   /// Char/Wchar in to the Object Reference.
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index 94aef786b28..7da0ba9288a 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -5,10 +5,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
-{
-}
-
 bool
 TAO_Codeset_Manager_Factory_Base::is_default () const
 {
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h
index 59c25927905..7a099960216 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.h
+++ b/TAO/tao/Codeset_Manager_Factory_Base.h
@@ -43,12 +43,12 @@ class TAO_Codeset_Manager;
 class TAO_Export TAO_Codeset_Manager_Factory_Base : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Codeset_Manager_Factory_Base ();
+  virtual ~TAO_Codeset_Manager_Factory_Base () = default;
 
   /// Create makes a new instance of the codeset manager for every
   /// call. This allows multiple ORBs to have their own (or none).
   /// This default implementation returns a null pointer only.
-  virtual TAO_Codeset_Manager *create(void);
+  virtual TAO_Codeset_Manager *create();
 
   /// Is_default is called by the ORB Core to determine if it needs
   /// to reload the factory with a dynamically linked libTAO_Codeset.
@@ -57,7 +57,7 @@ public:
   virtual bool is_default () const;
 
   /// Static initializer ensures the factory is loaded
-  static int initialize (void);
+  static int initialize ();
 };
 
 static int