Merge pull request #1458 from jwillemsen/jwi-cleanup

Minor cleanup

8 files changed, 8 insertions, 32 deletions

diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 5f361473c3a..0a9b2bf4c59 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "timeout_client.h"
 
 #include "tao/debug.h"
diff --git a/TAO/tests/AMI_Timeouts/timeout.idl b/TAO/tests/AMI_Timeouts/timeout.idl
index b87f26ad878..28f63aeae48 100644
--- a/TAO/tests/AMI_Timeouts/timeout.idl
+++ b/TAO/tests/AMI_Timeouts/timeout.idl
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    timeout.idl
@@ -10,8 +9,6 @@
  */
 //=============================================================================
 
-
-
 interface TimeoutObj {
 
   void sendTimeToWait (in long msec);
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.h b/TAO/tests/AMI_Timeouts/timeout_client.h
index 9ef578cbbd5..eea4333abc1 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.h
+++ b/TAO/tests/AMI_Timeouts/timeout_client.h
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    timeout_client.h
@@ -9,14 +8,10 @@
  */
 //=============================================================================
 
-
-
 #include "ace/Task.h"
-
 #include "timeout_i.h"
 
-class TimeoutClient
-: public ACE_Task_Base
+class TimeoutClient : public ACE_Task_Base
 {
 public:
   TimeoutClient (CORBA::ORB_ptr orb,
@@ -27,13 +22,12 @@ public:
 
   ~TimeoutClient ();
 
-
 private:
   // Initialize the context of this class.
   int initialize ();
 
   // Run in a separate thread.
-  virtual int svc (void );
+  virtual int svc ();
 
   // Wrapps complex invocations logic.
   void send (CORBA::Boolean async,
@@ -46,7 +40,7 @@ private:
   // Test the accuracy of the timeouts.
   int accuracy_test ();
 
-  // Test if the timeout functionaltiy disturbs non-timeout invocations
+  // Test if the timeout functionality disturbs non-timeout invocations
   int none_test ();
 
 private:
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index e497ca6eaa3..0a77ef98bc8 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    timeout_i.cpp
@@ -9,7 +8,6 @@
  */
 //=============================================================================
 
-
 #include "timeout_i.h"
 #include "ace/OS_NS_unistd.h"
 
@@ -18,10 +16,6 @@ Timeout_i::Timeout_i (CORBA::ORB_ptr orb)
   orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-Timeout_i::~Timeout_i ()
-{
-}
-
 void
 Timeout_i::sendTimeToWait (CORBA::Long msec)
 {
@@ -58,10 +52,6 @@ TimeoutHandler_i::TimeoutHandler_i ()
   timer_.stop ();
 }
 
-TimeoutHandler_i::~TimeoutHandler_i ()
-{
-}
-
 void
 TimeoutHandler_i::sendTimeToWait (void)
 {
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index de8803326e0..b5da504a2ed 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    timeout_i.h
@@ -9,12 +8,10 @@
  */
 //=============================================================================
 
-
 #ifndef TIMEOUT_I_H
 #define TIMEOUT_I_H
 
 #include "ace/High_Res_Timer.h"
-
 #include "timeoutS.h"
 
 class Timeout_i
@@ -23,14 +20,13 @@ class Timeout_i
 public:
   Timeout_i (CORBA::ORB_ptr orb);
 
-  ~Timeout_i ();
+  ~Timeout_i () = default;
 
   virtual void sendTimeToWait (CORBA::Long msec);
 
   virtual void shutdown (void);
 
 private:
-
   CORBA::ORB_var orb_;
 };
 
@@ -40,7 +36,7 @@ class TimeoutHandler_i
 public:
   TimeoutHandler_i ();
 
-  ~TimeoutHandler_i ();
+  ~TimeoutHandler_i () = default;
 
   virtual void sendTimeToWait (void);
 
diff --git a/TAO/tests/DIOP/UDP_Client_i.h b/TAO/tests/DIOP/UDP_Client_i.h
index 0dbc343c570..f7c8261fc7c 100644
--- a/TAO/tests/DIOP/UDP_Client_i.h
+++ b/TAO/tests/DIOP/UDP_Client_i.h
@@ -41,7 +41,7 @@ public:
 
 private:
   // Runs in a separate thread.
-  virtual int svc (void );
+  virtual int svc ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 118db532d9a..8d9a697ed1e 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -282,7 +282,7 @@ Client<InterfaceObj, Var>::obtain_initial_references (void)
 }
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void )
+Client<InterfaceObj, Var>::shutdown ()
 {
   // Returns the shutdwon flag
   return shutdown_;
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 80ccbf452fc..6087bf3bd9d 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -103,7 +103,7 @@ public:
   InterfaceObj *operator-> () { return server_.in ();};
 
   /// Returns the shutdown flag.
-  int shutdown (void );
+  int shutdown ();
 
   /// Fills in the shutdwon flag.
   void shutdown (int);