Merge pull request #1967 from jwillemsen/jwi-csdtest

Fixed compile error due to cleanup and made destructors default

12 files changed, 17 insertions, 64 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index c113ed46009..97724f5a5e9 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -162,7 +156,7 @@ ServerApp::collocated_setup()
       FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
       ClientEngine_Handle engine
-        = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true);
+        = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 0465ad64294..4285af45932 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -14,13 +14,11 @@ class ServerApp : public TestAppBase
 {
   public:
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
@@ -34,7 +32,6 @@ class ServerApp : public TestAppBase
     bool check_validity ();
     void cleanup();
 
-
     // Helper methods used by the methods above.
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index b94c0b06e9c..4b32a37d000 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -16,12 +16,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index a370109406b..0440cc39a43 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -9,13 +9,11 @@ class ServerApp : public TestAppBase
 {
   public:
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index efa6cbd9873..99a4bb9d5d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -22,11 +22,6 @@ ServerApp::ServerApp()
 }
 
 
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -122,7 +117,7 @@ ServerApp::collocated_setup()
       unsigned servant_index = i % this->num_servants_;
 
       ServantListType::T_stub_var obj = this->servants_.objref(servant_index);
-      ClientEngine_Handle engine = new Foo_A_ClientEngine(obj.in(), ++client_id_start, true);
+      ClientEngine_Handle engine = new Foo_A_ClientEngine(obj.in(), ++client_id_start);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 756f99d2481..0f791dc29fa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -13,13 +13,11 @@ class ServerApp : public TestAppBase
 {
   public:
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index a061d4a003f..66d647e3d4e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
@@ -166,7 +160,7 @@ ServerApp::collocated_setup()
       FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
       ClientEngine_Handle engine
-        = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id, true);
+        = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id);
       this->collocated_client_task_.add_engine(engine.in());
     }
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index f8b379d5884..abec9a82630 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -9,18 +9,15 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "ace/SString.h"
 
-
 class ServerApp : public TestAppBase
 {
   public:
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
     // These are all called, in order, by the run_i() method.
     int  init(int argc, ACE_TCHAR* argv[]);
@@ -34,7 +31,6 @@ class ServerApp : public TestAppBase
     bool check_validity ();
     void cleanup();
 
-
     // Helper methods used by the methods above.
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
@@ -47,7 +43,6 @@ class ServerApp : public TestAppBase
     void usage_statement();
     int  arg_dependency_checks();
 
-
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
                                        const char* poa_name);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index d767c9bee50..8c94b0eea4c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -23,12 +23,6 @@ ServerApp::ServerApp()
 {
 }
 
-
-ServerApp::~ServerApp()
-{
-}
-
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR* argv[])
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index 6a9e146e8ab..088dec93600 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -13,13 +13,11 @@ class ServerApp : public TestAppBase
 {
   public:
     ServerApp();
-    virtual ~ServerApp();
-
+    virtual ~ServerApp() = default;
 
   protected:
     virtual int run_i(int argc, ACE_TCHAR* argv[]);
 
-
   private:
     // These are all called, in order, by the run_i() method.
     int init(int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 00076b5953a..4502397719b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -16,10 +16,6 @@ ServerApp::ServerApp()
 {
 }
 
-ServerApp::~ServerApp()
-{
-}
-
 int
 ServerApp::run_i(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index 7440a8de40e..0b30f015bb5 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -6,18 +6,18 @@
 
 class ServerApp : public TestAppBase
 {
-  public:
-    ServerApp();
-    virtual ~ServerApp();
+public:
+  ServerApp();
+  virtual ~ServerApp() = default;
 
-  protected:
-    virtual int run_i (int argc, ACE_TCHAR *argv[]);
+protected:
+  virtual int run_i (int argc, ACE_TCHAR *argv[]);
 
-  private:
-    int parse_args (int argc, ACE_TCHAR *argv[]);
+private:
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
-    ACE_TString ior_filename_;
-    unsigned    num_clients_;
+  ACE_TString ior_filename_;
+  unsigned    num_clients_;
 };
 
 #endif