Make use of default

14 files changed, 27 insertions, 42 deletions

diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index c3354567841..0500ee74451 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -61,10 +61,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler () {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler () {};
+  ~Handler () = default;
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 906b70f4f4b..355ead34c61 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -68,7 +68,7 @@ public:
   Handler () : reply_count_ (0) {};
 
   /// Destructor.
-  ~Handler () {};
+  ~Handler () = default;
 
   /// Get the reply count
   long reply_count () const
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index c414a163b65..e74bea49396 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -20,7 +20,6 @@ Client_Task::Client_Task (const ACE_TCHAR *input,
     corb_ (CORBA::ORB::_duplicate (corb))
 {}
 
-
 int
 Client_Task::svc ()
 {
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
index 946f04972ab..9a9e55eb805 100644
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ b/TAO/tests/Bug_1869_Regression/server.cpp
@@ -4,21 +4,17 @@
 class  AdderServant :
   public POA_AMI_test::adder {
 public:
-  AdderServant () {}
+  AdderServant () = default;
 
-  virtual ~AdderServant () {}
+  virtual ~AdderServant () = default;
 
   virtual
-  CORBA::Long add (
-      CORBA::Long a,
-      CORBA::Long b
-    )
+  CORBA::Long add (CORBA::Long a, CORBA::Long b)
     {
       return a + b;
     }
 };
 
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
   try {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index cc86ca28203..3901b1ea1c4 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -60,8 +60,8 @@ CORBA::ORB_ptr orb;
 class FooImpl : public POA_Test::Foo
 {
 public:
-  FooImpl() {}
-  ~FooImpl() {}
+  FooImpl() = default;
+  ~FooImpl() = default;
 
   //-----------------------------------------------------------
 
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index fe960ccee5f..5d9afb6e56b 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -54,10 +54,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler () {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler () {};
+  ~Handler () = default;
 
   void foo ()
     {
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index be0d2e2de81..ef9002835a6 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -33,15 +33,15 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class ChildHandler : public POA_ChildModule::AMI_ChildInterfaceHandler
 {
 public:
-  ChildHandler () {};
-  ~ChildHandler () {};
+  ChildHandler () = default;
+  ~ChildHandler () = default;
 };
 
 class NonRelatedChildHandler : public POA_AMI_ChildInterfaceHandler
 {
 public:
-  NonRelatedChildHandler () {};
-  ~NonRelatedChildHandler () {};
+  NonRelatedChildHandler () = default;
+  ~NonRelatedChildHandler () = default;
 };
 
 int
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.cpp b/TAO/tests/Bug_3384_Regression/Client_i.cpp
index 9c421896d23..20a1ade9fc1 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Client_i.cpp
@@ -1,7 +1,5 @@
 #include "Client_i.h"
 
-Client::~Client () {}
-
 void Client::reply (const char * msg)
 {
   this->reply_count_++;
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.h b/TAO/tests/Bug_3384_Regression/Client_i.h
index ef594f641b5..9c3bcce2581 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.h
+++ b/TAO/tests/Bug_3384_Regression/Client_i.h
@@ -6,7 +6,7 @@ public:
   Client ()
     : POA_Test::Client(),
       reply_count_ (0) {}
-  virtual ~Client ();
+  virtual ~Client () = default;
 
   virtual void reply (
     const char * msg);
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp
index 9c9a314321e..3b988326a3c 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp
@@ -1,15 +1,11 @@
 #include "Server_i.h"
 
-Server::~Server () {}
-
-void Server::setup (
-  ::Test::Client_ptr cli)
+void Server::setup (::Test::Client_ptr cli)
 {
   this->cli_ = Test::Client::_duplicate (cli);
 }
 
-void Server::request (
-  ::CORBA::Long sel)
+void Server::request (::CORBA::Long sel)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server::request -> %d\n", sel));
   if (! CORBA::is_nil (this->cli_.in ()))
@@ -18,8 +14,7 @@ void Server::request (
   }
 }
 
-void Server::shutdown (
-  void)
+void Server::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.h b/TAO/tests/Bug_3384_Regression/Server_i.h
index c801fc07d8b..b4ad651c6b5 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.h
+++ b/TAO/tests/Bug_3384_Regression/Server_i.h
@@ -6,16 +6,13 @@ public:
   Server (CORBA::ORB_ptr orb)
     : POA_Test::Server(),
       orb_ (CORBA::ORB::_duplicate (orb)) {}
-  virtual ~Server ();
+  virtual ~Server () = default;
 
-  virtual void setup (
-    ::Test::Client_ptr cli);
+  virtual void setup (::Test::Client_ptr cli);
 
-  virtual void request (
-    ::CORBA::Long sel);
+  virtual void request (::CORBA::Long sel);
 
-  virtual void shutdown (
-    void);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp
index 7643da477ce..b14fdb5b1d8 100644
--- a/TAO/tests/Bug_3801_Regression/simple_client.cpp
+++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp
@@ -57,10 +57,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
   /// Constructor.
-  Handler () {};
+  Handler () = default;
 
   /// Destructor.
-    ~Handler () {};
+    ~Handler () = default;
 
   void get_yadda (CORBA::Long result)
     {
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index d95b6ccde0c..9c8ac01825c 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -26,8 +26,8 @@ bool caught_exception = false;
 class ClientTask : public ACE_Task_Base
 {
 public:
-  ClientTask () {};
-  ~ ClientTask () {};
+  ClientTask () = default;
+  ~ ClientTask () = default;
 
   virtual int svc ()
   {
diff --git a/TAO/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
index 41cdd34829e..b646ccfe784 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
@@ -1,7 +1,7 @@
 class mock_tdi
 {
 public:
-  mock_tdi () {}
+  mock_tdi () = default;
   u_long hash () {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));}
   mock_tdi *duplicate () {return 0;}
   CORBA::Boolean is_equivalent (const mock_tdi *) {return true;}