4 files changed, 7 insertions, 33 deletions
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index 8d90bd5c998..09e18be9865 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -5,18 +5,6 @@
 
 // This is the interface program that accesses the remote object
 
-// Constructor.
-Echo_Client_i::Echo_Client_i (void)
-{
-  //no-op
-}
-
-//Destructor.
-Echo_Client_i::~Echo_Client_i (void)
-{
-  //no-op
-}
-
 int
 Echo_Client_i::run (const char *name,
                     int argc,
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.h b/TAO/examples/Simple/echo/Echo_Client_i.h
index 8f923282d13..7596f0883ad 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.h
+++ b/TAO/examples/Simple/echo/Echo_Client_i.h
@@ -29,10 +29,10 @@ class Echo_Client_i
 {
 public:
   /// Constructor
-  Echo_Client_i (void);
+  Echo_Client_i () = default;
 
   /// Destructor
-  ~Echo_Client_i (void);
+  ~Echo_Client_i () = default;
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index c96b220634c..c32847e6c1c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -1,19 +1,6 @@
 #include "Echo_i.h"
 
-// Constructor.
-
-Echo_i::Echo_i (void)
-{
-}
-
-// Destructor.
-
-Echo_i::~Echo_i (void)
-{
-}
-
 // Set the ORB pointer.
-
 void
 Echo_i::orb (CORBA::ORB_ptr o)
 {
@@ -21,7 +8,6 @@ Echo_i::orb (CORBA::ORB_ptr o)
 }
 
 // Return a list of object references.
-
 Echo::List *
 Echo_i::echo_list (const char *)
 {
@@ -44,7 +30,7 @@ Echo_i::echo_list (const char *)
     orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(1)] =
-    orb_->resolve_initial_references ("NameService");;
+    orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(2)] =
     orb_->resolve_initial_references ("NameService");
@@ -80,7 +66,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 24041f3ee2b..88a6fee506e 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -30,10 +30,10 @@ class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i () = default;
 
   /// Destructor.
-  virtual ~Echo_i (void);
+  virtual ~Echo_i () = default;
 
   /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);