diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-10-13 15:01:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-13 15:01:30 +0200 |
commit | 731905bb8310a9001cedb8457186a343415926d3 (patch) | |
tree | 270b2c9208c656d4cc4686be63a7e944c071302d /TAO | |
parent | 0099c59a52cf7c6dac25e4a213751bd7f9632dcf (diff) | |
parent | 66da37c13452cd66442bb2baaa9beadbf3c449e4 (diff) | |
download | ATCD-731905bb8310a9001cedb8457186a343415926d3.tar.gz |
Merge pull request #1963 from jwillemsen/jwi-notused
Fixed unused variable warnings
Diffstat (limited to 'TAO')
105 files changed, 100 insertions, 376 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp index b6b31728320..65fb7d87f58 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp @@ -5,8 +5,6 @@ #include "DllORB.h" -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "bug2926", diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp index 2a8c410c42c..a38b5fc0ee2 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp @@ -5,8 +5,6 @@ #include "DllORB.h" -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "bug3646b", diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp index caf8ef284ac..3909d532eaa 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -6,8 +6,6 @@ #include "DllORB.h" -char const * const scpc_orbId = "testDllOrb"; - const int max_length = 1000; #if defined (ACE_USES_WCHAR) diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp index 7dbb8a1f845..f7c129c3628 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp @@ -5,8 +5,6 @@ #include "DllORB.h" -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "bug3646d", diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp index f76c8350b20..dcb485c86ad 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp @@ -5,8 +5,6 @@ #include "DllORB.h" -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "bug3663", diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp index 788178afc46..2f61282b07d 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp @@ -3,14 +3,10 @@ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/CosNamingC.h" - #include "DllORB.h" #include "TestListener.h" #include "TestBroadcaster.h" - -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "bug3688", diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 9a11058625a..38fc4db9cca 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -4,7 +4,6 @@ #include "TestS.h" int num_calls = 10; // total calls client is going to make -const int sleep_time = 1; // sleep for 1 sec on each call // This should equal num_calls within 'sleep * num_calls' seconds int calls_received = 0; @@ -44,7 +43,6 @@ protected: CORBA::ORB_var orb_; }; - /***************************/ /*** Servant Definition ***/ @@ -65,7 +63,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr, // the client as well } - /*** Server Declaration ***/ /** @@ -76,7 +73,7 @@ class ST_AMH_Server { public: ST_AMH_Server (int *argc, ACE_TCHAR **argv); - virtual ~ST_AMH_Server (); + virtual ~ST_AMH_Server () = default; /// ORB initialization stuff int start_orb_and_poa (); @@ -121,10 +118,6 @@ ST_AMH_Server::ST_AMH_Server (int* argc, ACE_TCHAR **argv) this->ior_output_file_ = const_cast<char*> ("test.ior"); } -ST_AMH_Server::~ST_AMH_Server () -{ -} - void ST_AMH_Server::cleanup () { diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index 05d667e8919..ae02f995243 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -18,7 +18,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, const char * in_str, bool check_params) : orb_ (CORBA::ORB::_duplicate (orb)), - number_ ((CORBA::Long) 931232), yadda_ ((CORBA::Long) 140474), in_l_ (in_l), in_str_(CORBA::string_dup(in_str)), diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index d6a316e2232..6487e77d505 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -45,8 +45,6 @@ public: private: CORBA::ORB_var orb_; - CORBA::Long number_; - CORBA::Long yadda_; CORBA::Long in_l_; 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/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index 3b9f0628482..5c43b5b1ed2 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -68,9 +68,6 @@ private: /// The ORB CORBA::ORB_var orb_; - /// Flag to indicate, whether we are ready for a remote call. - int flag_; - /// Callback Object Callback_var callback_; diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl index aba644cae6f..00eebe89830 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl @@ -9,7 +9,6 @@ ACE_INLINE Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations) : orb_ (CORBA::ORB::_duplicate (orb)), - flag_ (0), callback_ (0), no_iterations_ (no_iterations) { diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 9b78f5a9fe1..9c99a0644bd 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -62,9 +62,6 @@ private: /// The ORB CORBA::ORB_var orb_; - /// Flag to indicate, whether we are ready for a remote call. - int flag_; - /// Callback Object Callback_var callback_; diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl index d29fbb9f970..566fe0d303c 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl @@ -8,7 +8,6 @@ ACE_INLINE Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations) : orb_ (CORBA::ORB::_duplicate (orb)), - flag_ (0), callback_ (0), no_iterations_ (no_iterations) { 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_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index 5c85837527c..544f7cf94e1 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -9,8 +9,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) void Echo_Caller::start_task(Test::Echo_ptr client) { - Server_Task task (client, - 32768); + Server_Task task (client); if (task.activate (THR_NEW_LWP | THR_JOINABLE, 4, diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp index 780d8fc11a1..636bf70bd7b 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp @@ -1,10 +1,7 @@ #include "Server_Task.h" -Server_Task::Server_Task (Test::Echo_ptr echo, - size_t sz) - : echo_ (Test::Echo::_duplicate (echo)), - sz_ (sz) - +Server_Task::Server_Task (Test::Echo_ptr echo) + : echo_ (Test::Echo::_duplicate (echo)) { } @@ -14,7 +11,6 @@ Server_Task::svc () Test::Payload payload (32768); payload.length (32768); - try { // Send messages till the remote guy crashes diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h index 0a173ded745..9ab337f4976 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h @@ -18,8 +18,7 @@ class Server_Task : public ACE_Task_Base { public: /// Constructor - Server_Task (Test::Echo_ptr echo, - size_t sz); + Server_Task (Test::Echo_ptr echo); /// The thread entry point. virtual int svc (); @@ -27,9 +26,6 @@ public: private: /// Reference to the test interface Test::Echo_var echo_; - - /// Size of data that is traded - size_t sz_; }; #include /**/ "ace/post.h" 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_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 328a193e2df..020c59454fd 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -36,8 +36,7 @@ Client_Task::svc () Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, - Hello (this->corb_.in (), - ACE_Thread::self ()), + Hello (this->corb_.in ()), 1); PortableServer::ServantBase_var owner_transfer(hello_impl); diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index 8c20571d7dc..4a7e3042fb9 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -4,10 +4,8 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -Hello::Hello (CORBA::ORB_ptr orb, - ACE_thread_t thrid) +Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) - , thr_id_ (thrid) { } diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h index 32cac823934..6101540e48d 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.h +++ b/TAO/tests/Bug_2084_Regression/Hello.h @@ -14,10 +14,8 @@ class Hello { public: /// Constructor - Hello (CORBA::ORB_ptr orb, - ACE_thread_t thr_id); + Hello (CORBA::ORB_ptr orb); - // = The skeleton methods virtual char * get_string (::Test::ThreadId caller_threadid); virtual void shutdown (); @@ -26,8 +24,6 @@ private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; - - ACE_thread_t const thr_id_; }; #include /**/ "ace/post.h" 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_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp index 1c70ca33855..a171be3fec9 100644 --- a/TAO/tests/Bug_2241_Regression/Hello.cpp +++ b/TAO/tests/Bug_2241_Regression/Hello.cpp @@ -3,10 +3,8 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" - Hello::Hello (CORBA::ORB_ptr orb, - ACE_thread_t thrid) +Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) - , thr_id_ (thrid) { } diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h index e9c0f470f49..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_2241_Regression/Hello.h +++ b/TAO/tests/Bug_2241_Regression/Hello.h @@ -11,8 +11,7 @@ class Hello { public: /// Constructor - Hello (CORBA::ORB_ptr orb, - ACE_thread_t thr_id); + Hello (CORBA::ORB_ptr orb); // = The skeleton methods virtual char * get_string (); @@ -23,8 +22,6 @@ private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; - - ACE_thread_t thr_id_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.cpp b/TAO/tests/Bug_2241_Regression/Server_Task.cpp index 0a0d94fee37..4f6c3814cd9 100644 --- a/TAO/tests/Bug_2241_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2241_Regression/Server_Task.cpp @@ -36,8 +36,7 @@ Server_Task::svc () Hello *hello_impl; ACE_NEW_RETURN (hello_impl, - Hello (this->sorb_.in (), - ACE_Thread::self ()), + Hello (this->sorb_.in ()), 1); PortableServer::ServantBase_var owner_transfer(hello_impl); diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index fedb6b515bf..91cc45715f8 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -8,7 +8,6 @@ #include "TestC.h" int num_calls = 10; // total calls client is going to make -const int sleep_time = 1; // sleep for 1 sec on each call // This should equal num_calls within 'sleep * num_calls' seconds int calls_received = 0; @@ -43,7 +42,7 @@ protected: class ST_AMH_Server { public: - ST_AMH_Server (); + ST_AMH_Server () = default; virtual ~ST_AMH_Server (); /// ORB inititalisation stuff @@ -123,12 +122,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr, // ------------------------------------------------------------------------ // -ST_AMH_Server::ST_AMH_Server () -{ -} - -// ------------------------------------------------------------------------ -// ST_AMH_Server::~ST_AMH_Server () { try 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_2805_Regression/README.txt b/TAO/tests/Bug_2805_Regression/README.txt index 9770264edf2..3d79f95c5ca 100644 --- a/TAO/tests/Bug_2805_Regression/README.txt +++ b/TAO/tests/Bug_2805_Regression/README.txt @@ -1,3 +1 @@ - - This test is a reproducer for bug 2805 and bug 2806. diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp index 4824a2e1156..a703eca40cd 100644 --- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp @@ -19,7 +19,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, const char * in_str, bool check_params) : orb_ (CORBA::ORB::_duplicate (orb)), - number_ ((CORBA::Long) 931232), yadda_ ((CORBA::Long) 140474), in_l_ (in_l), in_str_(CORBA::string_dup(in_str)), diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.h b/TAO/tests/Bug_2805_Regression/ami_test_i.h index 190bddd3294..2a6fbf3e3af 100644 --- a/TAO/tests/Bug_2805_Regression/ami_test_i.h +++ b/TAO/tests/Bug_2805_Regression/ami_test_i.h @@ -24,9 +24,7 @@ class AMI_Test_i : public POA_A::AMI_Test { public: /// ctor - AMI_Test_i (CORBA::ORB_ptr orb, - CORBA::Long in_l = 0, const char * in_str = 0, - bool check_params = false); + AMI_Test_i (CORBA::ORB_ptr orb, CORBA::Long in_l = 0, const char * in_str = 0, bool check_params = false); // The AMI_Test methods. CORBA::Long foo (CORBA::Long_out out_l, @@ -44,8 +42,6 @@ public: private: CORBA::ORB_var orb_; - CORBA::Long number_; - CORBA::Long yadda_; CORBA::Long in_l_; diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 74262da89be..faaef059824 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -10,7 +10,6 @@ */ //============================================================================= - #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Atomic_Op.h" @@ -96,9 +95,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler () - { - }; + Handler () = default; void foo (CORBA::Long result, CORBA::Long out_l) @@ -160,9 +157,7 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); }; - ~Handler () - { - }; + ~Handler () = default; void inout_arg_test (const char *) { diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp index 1223e7c0876..bec89c55495 100644 --- a/TAO/tests/Bug_2936_Regression/bug2936.cpp +++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp @@ -2,8 +2,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_unistd.h" -char const * const scpc_orbId = "testDllOrb"; - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testDllOrb", "bug2936", diff --git a/TAO/tests/Bug_3068_Regression/README b/TAO/tests/Bug_3068_Regression/README index 63080498b54..4b708190dd7 100644 --- a/TAO/tests/Bug_3068_Regression/README +++ b/TAO/tests/Bug_3068_Regression/README @@ -1,5 +1,3 @@ - - This test is for validating the fix for a race condition exposed in the Transport_Cache_Manager. The problem is that an internal pointer used to test intermediate return values to the cache may be deleted by one diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp index b6c71320485..a1ddc8d3806 100644 --- a/TAO/tests/Bug_3068_Regression/server.cpp +++ b/TAO/tests/Bug_3068_Regression/server.cpp @@ -7,12 +7,11 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" const ACE_TCHAR *ior_output_file = 0; -int iterations = 10; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:i:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:")); int c; while ((c = get_opts ()) != -1) @@ -21,13 +20,9 @@ parse_args (int argc, ACE_TCHAR *argv[]) case 'o': ior_output_file = get_opts.opt_arg (); break; - case 'i': - iterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; case '?': default: - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -o <iorfile>") - ACE_TEXT ("-i <iterations>\n"), argv [0]), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -o <iorfile>\n"), argv [0]), -1); } // Indicates successful parsing of the command line @@ -89,7 +84,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - Simple_Server_i server_impl (orb.in (), iterations); + Simple_Server_i server_impl (orb.in ()); PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("simple_server"); diff --git a/TAO/tests/Bug_3068_Regression/test_i.h b/TAO/tests/Bug_3068_Regression/test_i.h index 7558a4fae86..3eaeba850d6 100644 --- a/TAO/tests/Bug_3068_Regression/test_i.h +++ b/TAO/tests/Bug_3068_Regression/test_i.h @@ -72,7 +72,7 @@ class Simple_Server_i : public POA_Simple_Server { public: /// ctor - Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); + Simple_Server_i (CORBA::ORB_ptr orb); // = The Simple_Server methods. void ow_test (); @@ -87,14 +87,10 @@ private: /// The ORB CORBA::ORB_var orb_; - /// Flag to indicate, whether we are ready for a remote call. - int flag_; - /// Callback Object Caller *caller_; /// Number of times the callback needs to be called - int iterations_; int ow_count_; }; diff --git a/TAO/tests/Bug_3068_Regression/test_i.inl b/TAO/tests/Bug_3068_Regression/test_i.inl index 99c25e480f0..72fba134549 100644 --- a/TAO/tests/Bug_3068_Regression/test_i.inl +++ b/TAO/tests/Bug_3068_Regression/test_i.inl @@ -5,10 +5,8 @@ Callback_i::Callback_i (CORBA::ORB_ptr orb) } ACE_INLINE -Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations) +Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), - flag_ (0), - caller_ (0), - iterations_ (no_iterations) + caller_ (0) { } 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_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp index f356ef712c3..0caeb772223 100644 --- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp @@ -20,7 +20,6 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, const char * in_str, bool check_params) : orb_ (CORBA::ORB::_duplicate (orb)), - number_ ((CORBA::Long) 931232), yadda_ ((CORBA::Long) 140474), in_l_ (in_l), in_str_(CORBA::string_dup(in_str)), diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.h b/TAO/tests/Bug_3567_Regression/ami_test_i.h index d6a316e2232..6487e77d505 100644 --- a/TAO/tests/Bug_3567_Regression/ami_test_i.h +++ b/TAO/tests/Bug_3567_Regression/ami_test_i.h @@ -45,8 +45,6 @@ public: private: CORBA::ORB_var orb_; - CORBA::Long number_; - CORBA::Long yadda_; CORBA::Long in_l_; diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index ac8c904bb95..c59bb94fb57 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -10,7 +10,6 @@ */ //============================================================================= - #include "ami_test_i.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" @@ -28,15 +27,15 @@ int nthreads = 5; class Worker : public ACE_Task_Base { public: - Worker (CORBA::ORB_ptr orb); // ctor + Worker (CORBA::ORB_ptr orb); - virtual int svc (); // The thread entry point. + virtual int svc (); private: - CORBA::ORB_var orb_; // The orb + CORBA::ORB_var orb_; }; int diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp index 496ebdac06c..10e4128d235 100644 --- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp +++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp @@ -10,11 +10,6 @@ Backend_Impl(CORBA::ORB_ptr orb, bool verbose) { } -Bug_3647_Regression::Backend_Impl:: -~Backend_Impl() -{ -} - void Bug_3647_Regression::Backend_Impl:: startup_test() { diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h index 250ecc2e3df..94d97c0d747 100644 --- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h @@ -14,7 +14,7 @@ class Backend_Impl : public POA_Bug_3647_Regression::Backend { public: Backend_Impl(CORBA::ORB_ptr orb, bool verbose); - virtual ~Backend_Impl(); + virtual ~Backend_Impl() = default; virtual void startup_test(); virtual void ping(Bug_3647_Regression::Payload const & the_payload); diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp index c5904345484..d63515c023c 100644 --- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp +++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp @@ -5,18 +5,11 @@ Bug_3647_Regression::Middle_Impl:: Middle_Impl( Backend_ptr backend, CORBA::ORB_ptr orb, - bool verbose, - long timeout) + bool verbose) : POA_Bug_3647_Regression::Middle() , backend_(Bug_3647_Regression::Backend::_duplicate(backend)) , orb_(CORBA::ORB::_duplicate(orb)) , verbose_(verbose) - , timeout_(timeout) -{ -} - -Bug_3647_Regression::Middle_Impl:: -~Middle_Impl() { } diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h index ed79d8ca8a2..8c551e21c7b 100644 --- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h @@ -16,9 +16,8 @@ public: Middle_Impl( Backend_ptr backend, CORBA::ORB_ptr orb, - bool verbose, - long timeout); - virtual ~Middle_Impl(); + bool verbose); + virtual ~Middle_Impl() = default; virtual void startup_test(); virtual void ping(); @@ -34,9 +33,6 @@ private: /// Use this flag to decide if the program should produce any output. bool verbose_; - - /// Control the freeze time based on the timeout time - long timeout_; }; } // namespace Bug_3647_Regression diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp index 3c19504187c..28fc2dcc382 100644 --- a/TAO/tests/Bug_3647_Regression/middle_server.cpp +++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp @@ -167,8 +167,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) using namespace Bug_3647_Regression; PortableServer::ServantBase_var impl( - new Middle_Impl(backend.in(), orb.in(), verbose, - timeout)); + new Middle_Impl(backend.in(), orb.in(), verbose)); PortableServer::ObjectId_var id = root_poa->activate_object (impl.in()); 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_ORBInitializer.cpp b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp index b41b6229938..02abc62c33b 100644 --- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp @@ -1,10 +1,6 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -Client_ORBInitializer::Client_ORBInitializer () -{ -} - void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h index bc637249076..0001a5a2dc9 100644 --- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (); + Client_ORBInitializer () = default; virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp index 6c66d595335..ead9e62ad5c 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp +++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp @@ -7,11 +7,6 @@ Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb) { } -// Implementation skeleton destructor -Demo_HelloWorld_i::~Demo_HelloWorld_i () -{ -} - void Demo_HelloWorld_i::sayHello (const char * msg) { ACE_OS::sleep(1); diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h index 9e46919a57f..3b88274a355 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.h +++ b/TAO/tests/Bug_3853_Regression/Hello_i.h @@ -16,7 +16,7 @@ public: Demo_HelloWorld_i (CORBA::ORB_ptr orb); // Destructor - virtual ~Demo_HelloWorld_i (); + virtual ~Demo_HelloWorld_i () = default; virtual void sayHello (const char * msg); 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/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp index 72004e255b6..4451032eac2 100644 --- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp @@ -5,8 +5,6 @@ extern const ACE_TCHAR *server2_ior; extern CORBA::ORB_var orb; -const IOP::ServiceId service_id = 0xdeadbeef; - int isRecursive = 0; extern Demo::HelloWorld_var server1_shutdownObj; @@ -16,10 +14,6 @@ Echo_Client_Request_Interceptor () { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () -{ -} - char * Echo_Client_Request_Interceptor::name () { diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h index d6524e1e8a5..7d74e98ed29 100644 --- a/TAO/tests/Bug_3853_Regression/client_interceptor.h +++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h @@ -25,7 +25,7 @@ public: Echo_Client_Request_Interceptor (); // ctor. - virtual ~Echo_Client_Request_Interceptor (); + virtual ~Echo_Client_Request_Interceptor () = default; // dtor. virtual char * name (); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp index b621080eedd..4c25617229e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp @@ -5,20 +5,12 @@ #include "ace/Log_Msg.h" Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj, - unsigned client_id, - bool collocated) + unsigned client_id) : obj_(Foo_A::_duplicate(obj)), - client_id_ (client_id), - collocated_ (collocated) + client_id_ (client_id) { } - -Foo_A_ClientEngine::~Foo_A_ClientEngine() -{ -} - - bool Foo_A_ClientEngine::execute() { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h index 6b9a1eb3af1..4ede3d6f51e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h @@ -18,8 +18,8 @@ class Foo_A_Statistics; class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine { public: - Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); - virtual ~Foo_A_ClientEngine(); + Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0); + virtual ~Foo_A_ClientEngine() = default; virtual bool execute(); @@ -28,7 +28,6 @@ public: private: Foo_A_var obj_; unsigned client_id_; - bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp index 95115803f11..497be9e9f05 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp @@ -11,12 +11,6 @@ Foo_A_Statistics::Foo_A_Statistics(unsigned num_clients) } } - -Foo_A_Statistics::~Foo_A_Statistics() -{ -} - - void Foo_A_Statistics::expected(unsigned op_num, unsigned count) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h index e7ca7be5c4a..af2f9ee35e7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h @@ -10,7 +10,7 @@ class CSD_TP_Foo_A_Export Foo_A_Statistics public: Foo_A_Statistics(unsigned num_clients); - virtual ~Foo_A_Statistics(); + virtual ~Foo_A_Statistics() = default; void expected(unsigned op_num, unsigned count); void actual(unsigned op_num, unsigned count); @@ -18,7 +18,6 @@ class CSD_TP_Foo_A_Export Foo_A_Statistics bool actual_vs_expected(); - private: unsigned num_clients_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp index ac1805dcc8e..3162fe4fd28 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp @@ -10,12 +10,6 @@ Foo_A_i::Foo_A_i() } } - -Foo_A_i::~Foo_A_i() -{ -} - - void Foo_A_i::op1() { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h index b99434ff4ee..f56dc876e09 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h @@ -10,7 +10,7 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A { public: Foo_A_i(); - virtual ~Foo_A_i(); + virtual ~Foo_A_i() = default; virtual void op1(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp index ffccade7cf2..24dc43f5124 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp @@ -9,21 +9,13 @@ const char* ONEWAY_ARG_TEST_STR = "TEST"; Foo_B_ClientEngine::Foo_B_ClientEngine(Foo_B_ptr obj, Callback_ptr callback, - unsigned client_id, - bool collocated) + unsigned client_id) : obj_(Foo_B::_duplicate(obj)), callback_(Callback::_duplicate(callback)), - client_id_(client_id), - collocated_(collocated) + client_id_(client_id) { } - -Foo_B_ClientEngine::~Foo_B_ClientEngine() -{ -} - - bool Foo_B_ClientEngine::execute() { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h index d95eb496f4c..09dea672b18 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h @@ -21,10 +21,9 @@ class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine public: Foo_B_ClientEngine(Foo_B_ptr obj, Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); + unsigned client_id = 0); - virtual ~Foo_B_ClientEngine(); + virtual ~Foo_B_ClientEngine() = default; virtual bool execute(); @@ -35,7 +34,6 @@ private: Foo_B_var obj_; Callback_var callback_; unsigned client_id_; - bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp index 0e1fad1a160..427602fe60b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp @@ -9,21 +9,13 @@ extern const char* ONEWAY_ARG_TEST_STR; Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, Callback_ptr callback, - unsigned client_id, - bool collocated) + unsigned client_id) : obj_(Foo_B::_duplicate(obj)), callback_(Callback::_duplicate(callback)), - client_id_(client_id), - collocated_(collocated) + client_id_(client_id) { } - -Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine() -{ -} - - bool Foo_B_SimpleClientEngine::execute() { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h index 8f77c6295e3..695b38b256c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h @@ -21,10 +21,9 @@ class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine public: Foo_B_SimpleClientEngine(Foo_B_ptr obj, Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); + unsigned client_id = 0); - virtual ~Foo_B_SimpleClientEngine(); + virtual ~Foo_B_SimpleClientEngine() = default; virtual bool execute(); @@ -35,7 +34,6 @@ private: Foo_B_var obj_; Callback_var callback_; unsigned client_id_; - bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp index 79cdd00ed9b..108567a0dbe 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp @@ -19,12 +19,6 @@ Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients, } } - -Foo_B_Statistics::~Foo_B_Statistics() -{ -} - - void Foo_B_Statistics::expected(unsigned op_num, unsigned count, In_Value_Type type) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h index 3a76bff1327..cc36cc0739b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h @@ -18,7 +18,7 @@ class CSD_TP_Foo_B_Export Foo_B_Statistics Foo_B_Statistics(unsigned num_remote_clients, unsigned num_collcated_clients); - virtual ~Foo_B_Statistics(); + virtual ~Foo_B_Statistics() = default; void expected(unsigned op_num, unsigned count, In_Value_Type type); void actual(unsigned op_num, unsigned count); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index cb804eac88b..0137228926d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -13,11 +13,6 @@ Foo_B_i::Foo_B_i() } -Foo_B_i::~Foo_B_i() -{ -} - - void Foo_B_i::op1() { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h index 0de419f732b..1c2077132d4 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h @@ -10,7 +10,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B { public: Foo_B_i(); - virtual ~Foo_B_i(); + virtual ~Foo_B_i() = default; virtual void op1(); diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index 66881d0e2fc..a8f749ecfdc 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -54,9 +54,6 @@ static const unsigned long ACE_UTF16_RAW_END = 0x00010000LU; // largest value that can be represented in UTF16 + 1 static const unsigned long ACE_UTF16_END = 0x00110000LU; -// largest value that can be represented in UTF-32 + 1 -static const unsigned long ACE_UTF32_END = 0x80000000LU; - static const unsigned short ACE_UNICODE_SUBSTITUTE_CHARACTER = 0xFFFDU; static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp index 7328ee29ef7..a2c2c2425fa 100644 --- a/TAO/tests/Collocated_Forwarding/server.cpp +++ b/TAO/tests/Collocated_Forwarding/server.cpp @@ -93,8 +93,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - test_i servant1 (1, direct_collocation, orb.in ()); - test_i servant2 (2, direct_collocation, orb.in ()); + test_i servant1 (1, orb.in ()); + test_i servant2 (2, orb.in ()); PortableServer::ObjectId_var oid1 = root_poa->activate_object (&servant1); diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp index 7b52881b9a4..4ccb5c4e7d0 100644 --- a/TAO/tests/Collocated_Forwarding/test_i.cpp +++ b/TAO/tests/Collocated_Forwarding/test_i.cpp @@ -4,10 +4,8 @@ #include "tao/PortableServer/ForwardRequestC.h" test_i::test_i (CORBA::Short id, - bool direct, CORBA::ORB_ptr orb) : id_ (id) - , direct_ (direct) , orb_ (CORBA::ORB::_duplicate (orb)) , to_ (CORBA::Object::_nil ()) , request_pass_count_ (0) diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h index cd26df18997..623e3c0b806 100644 --- a/TAO/tests/Collocated_Forwarding/test_i.h +++ b/TAO/tests/Collocated_Forwarding/test_i.h @@ -16,7 +16,6 @@ class test_i : public virtual POA_Collocated_ForwardRequestTest::test public: /// Constructor. test_i (CORBA::Short id, - bool direct, CORBA::ORB_ptr orb); /// A way to setup forwarding in case of direct collocation. @@ -30,9 +29,6 @@ private: /// Id of this instance. CORBA::Short id_; - /// An indication to throwing forward request exception. - bool direct_; - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp index 1092b33968f..659936a8069 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp @@ -3,10 +3,8 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" - Hello::Hello (CORBA::ORB_ptr orb, - ACE_thread_t thrid) + Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) - , thr_id_ (thrid) { } diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h index e9c0f470f49..88fd5ffb5b8 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Hello.h +++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h @@ -11,8 +11,7 @@ class Hello { public: /// Constructor - Hello (CORBA::ORB_ptr orb, - ACE_thread_t thr_id); + Hello (CORBA::ORB_ptr orb); // = The skeleton methods virtual char * get_string (); @@ -23,8 +22,6 @@ private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; - - ACE_thread_t thr_id_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp index 21e398ead92..02657c932e1 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp @@ -36,8 +36,7 @@ Server_Task::svc () Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, - Hello (this->sorb_.in (), - ACE_Thread::self ()), + Hello (this->sorb_.in ()), 1); PortableServer::ServantBase_var owner_transfer(hello_impl); diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp index 1092b33968f..5c55d9562f1 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp @@ -3,10 +3,8 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" - Hello::Hello (CORBA::ORB_ptr orb, - ACE_thread_t thrid) +Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) - , thr_id_ (thrid) { } diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h index e9c0f470f49..88fd5ffb5b8 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h @@ -11,8 +11,7 @@ class Hello { public: /// Constructor - Hello (CORBA::ORB_ptr orb, - ACE_thread_t thr_id); + Hello (CORBA::ORB_ptr orb); // = The skeleton methods virtual char * get_string (); @@ -23,8 +22,6 @@ private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; - - ACE_thread_t thr_id_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp index 0a0d94fee37..4f6c3814cd9 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp @@ -36,8 +36,7 @@ Server_Task::svc () Hello *hello_impl; ACE_NEW_RETURN (hello_impl, - Hello (this->sorb_.in (), - ACE_Thread::self ()), + Hello (this->sorb_.in ()), 1); PortableServer::ServantBase_var owner_transfer(hello_impl); diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 2e60d01db03..287dace0441 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -1,35 +1,26 @@ #include "Counter_i.h" -// Dtor-Ctor Implementation. - Counter_Servant::Counter_Servant (Policy_Tester *policy_tester) : count_ (0), policy_tester_ (policy_tester) { - // No-Op. -} - -Counter_Servant::~Counter_Servant () -{ - // No-Op. } // Counter Interface Methods Implementation. - void -Counter_Servant::increment (/**/) +Counter_Servant::increment () { ++this->count_; } CORBA::Long -Counter_Servant::get_count (/**/) +Counter_Servant::get_count () { return this->count_; } void -Counter_Servant::reset (/**/) +Counter_Servant::reset () { this->count_ = 0; } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index eb6e66b79be..d4bed6f4ae5 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -22,9 +22,8 @@ class Counter_Servant : public POA_Counter { public: // = Ctor-Dtor Declaration - Counter_Servant (Policy_Tester *policy_tester); - virtual ~Counter_Servant (); + virtual ~Counter_Servant () = default; // = Counter Interface Methods Overloading. diff --git a/TAO/tests/Exposed_Policies/Object.cfg.tru64 b/TAO/tests/Exposed_Policies/Object.cfg.tru64 deleted file mode 100644 index adba1999c4a..00000000000 --- a/TAO/tests/Exposed_Policies/Object.cfg.tru64 +++ /dev/null @@ -1 +0,0 @@ -Priority 24 diff --git a/TAO/tests/Exposed_Policies/POA.cfg.tru64 b/TAO/tests/Exposed_Policies/POA.cfg.tru64 deleted file mode 100644 index d327282c330..00000000000 --- a/TAO/tests/Exposed_Policies/POA.cfg.tru64 +++ /dev/null @@ -1,5 +0,0 @@ -Priority 21 - -Priority_Bands 2 -Priority_Range 20 22 -Priority_Range 23 25 diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index 0ae1ebae8a7..614efa22c28 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -16,17 +16,6 @@ #include "tao/ORB_Constants.h" #include "tao/ORB_Core.h" -Policy_Tester::Policy_Tester () - : rt_object_properties_ (0), - rt_poa_properties_ (0) -{ - // No_Op -} - -Policy_Tester::~Policy_Tester () -{ -} - void Policy_Tester::run () { diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 99329d281e3..8e34e786ca0 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -25,8 +25,8 @@ class Policy_Tester { public: // Ctor/Dtor. - Policy_Tester (); - ~Policy_Tester (); + Policy_Tester () = default; + ~Policy_Tester () = default; /// Runs the test. void run (); @@ -43,14 +43,12 @@ private: const char *msg); private: - int is_initialized_; - RTCORBA::RTORB_var rt_orb_; CORBA::ORB_var orb_; PortableServer::POA_var poa_; RTPortableServer::POA_var child_poa_; - RT_Properties *rt_object_properties_; - RT_Properties *rt_poa_properties_; + RT_Properties *rt_object_properties_ {}; + RT_Properties *rt_poa_properties_ {}; }; diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 8218b5ac219..5d68906672f 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -11,11 +11,6 @@ RT_Properties::RT_Properties () ior_source_ = ACE_TEXT("poa_default.ior"); } -RT_Properties::~RT_Properties () -{ - // No-Op. -} - RT_Properties * RT_Properties::read_from (const ACE_TCHAR *file_name) { diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h index c627fb70c9a..88acc5efcfa 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.h +++ b/TAO/tests/Exposed_Policies/RT_Properties.h @@ -20,7 +20,7 @@ class RT_Properties public: // -- Ctor/Dtor -- RT_Properties (); - ~RT_Properties (); + ~RT_Properties () = default; static RT_Properties * read_from (const ACE_TCHAR *file_name); diff --git a/TAO/tests/ForwardOnceUponException/test_i.inl b/TAO/tests/ForwardOnceUponException/test_i.inl index 41ff942499f..a443c099829 100644 --- a/TAO/tests/ForwardOnceUponException/test_i.inl +++ b/TAO/tests/ForwardOnceUponException/test_i.inl @@ -8,7 +8,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) { } - ACE_INLINE int Simple_Server_i::ncalls () const { diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index e2d704d87a8..ddd48f6c45d 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -7,8 +7,7 @@ const CORBA::ULong freq = 919263; Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)), - val_ (1) + : orb_ (CORBA::ORB::_duplicate (orb)) { } diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h index 822d6e68bd9..531f5e84bd0 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.h +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h @@ -36,8 +36,6 @@ public: private: CORBA::ORB_var orb_; - - CORBA::Long val_; }; #endif /* TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H */ diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp index b8f3f0697ba..9735c5a5d77 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) test_i_rh_srv.test_handler ().set_reply_handler (rh.in ()); // create and activate test servant - Test_i test_i_srv (orb.in (), rh.in (), max_count, mode_flag); + Test_i test_i_srv (orb.in (), rh.in (), mode_flag); id = root_poa->activate_object (&test_i_srv); diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp index c9347ae5e33..ccfe718ef5c 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp @@ -14,11 +14,9 @@ Test_i::Test_i (CORBA::ORB_ptr orb, A::AMI_TestHandler_ptr rh, - CORBA::ULong max_count, A::RunMode mode) : orb_ (CORBA::ORB::_duplicate (orb)), rh_ (A::AMI_TestHandler::_duplicate (rh)), - max_count_ (max_count), mode_(mode) { time_t _tm = ACE_OS::time (); diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h index 5f7acc1211b..ef04a58383f 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h @@ -23,7 +23,6 @@ public: /// ctor Test_i (CORBA::ORB_ptr orb, A::AMI_TestHandler_ptr rh, - CORBA::ULong max_count = 10, A::RunMode mode = A::RM_SLAVE); void set_opponent (A::Test_ptr opp); @@ -45,8 +44,6 @@ private: A::Test_var opponent_; - CORBA::ULong max_count_; - A::RunMode mode_; unsigned int seed_; diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index efa989f4ad8..072769076e8 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -27,8 +27,7 @@ public: /// ctor Test_impl (CORBA::ORB_ptr orb); - virtual CORBA::Any * get_something ( - CORBA::Boolean need_vb); + virtual CORBA::Any * get_something (CORBA::Boolean need_vb); virtual OBV_AnyTest::VB * get_vb (); @@ -37,7 +36,6 @@ public: private: /// The ORB CORBA::ORB_var orb_; - CORBA::Boolean even_; }; #endif /* TAO_ANY_S_IMPL_H */ diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp index a9d251e4c5c..644fe350085 100644 --- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp @@ -21,8 +21,10 @@ // UIOP const ACE_TCHAR argStrA[] = ACE_TEXT ("AAA -ORBGestalt LOCAL -ORBId ORB-A -ORBSvcConf a.conf"); +#if defined (DO_1459_SSLIOP_TEST) // SSLIOP const ACE_TCHAR argStrB[] = ACE_TEXT ("BBB -ORBGestalt LOCAL -ORBId ORB-B -ORBSvcConf b.conf"); +#endif // UIPMC const ACE_TCHAR argStrC[] = ACE_TEXT ("CCC -ORBGestalt LOCAL -ORBId ORB-C -ORBSvcConf m1.conf"); diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp index e570f98f4bb..ee7ab003514 100644 --- a/TAO/tests/Oneway_Timeouts/server.cpp +++ b/TAO/tests/Oneway_Timeouts/server.cpp @@ -9,8 +9,6 @@ #include "ace/High_Res_Timer.h" #include "ace/Reactor.h" -const int TIME_THRESHOLD = 50; //ms - int activate_delay = 0000; int run_delay = 00; int request_delay = 00; @@ -29,17 +27,13 @@ class Tester_i public: Tester_i (CORBA::ORB_ptr orb) : orb_ (orb) - , id1_ (0) - , id2_ (0) , count_ (0) , failed_ (false) { this->start_ = ACE_High_Res_Timer::gettimeofday_hr (); } - virtual ~Tester_i () - { - } + virtual ~Tester_i () = default; virtual void test (CORBA::Long id) { @@ -137,8 +131,6 @@ public: private: CORBA::ORB_ptr orb_; - CORBA::Long id1_; - CORBA::Long id2_; int count_; bool failed_; ACE_Time_Value start_; diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp index 99b71879fdd..824161368a6 100644 --- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp @@ -16,8 +16,7 @@ #include "ace/OS_NS_string.h" ServantLocator::ServantLocator (CORBA::ORB_ptr orb) - : counter_ (0), - orb_ (CORBA::ORB::_duplicate (orb)) + : orb_ (CORBA::ORB::_duplicate (orb)) { } diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h index 87f6f927d3e..1801d1d1e4f 100644 --- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h +++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h @@ -46,8 +46,5 @@ public: PortableServer::Servant the_servant); private: - /// Counter for number of invocations of this. - int counter_; - CORBA::ORB_var orb_; }; diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 34628832a2e..0411ed36200 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -11,11 +11,6 @@ namespace Test { IIOP_Server_Request_Interceptor::IIOP_Server_Request_Interceptor (const char* orbid, TEST test) : Server_Request_Interceptor (orbid, test) , iiop_test_successful_ (true) - , mult_thr_test_successful_ (true) - { - } - - IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor () { } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 5c95455e007..ed110479a1c 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -36,7 +36,7 @@ namespace Test IIOP_Server_Request_Interceptor (const char* orbid, TEST test); /// Destructor. - virtual ~IIOP_Server_Request_Interceptor (); + virtual ~IIOP_Server_Request_Interceptor () = default; /// queries the status of the test virtual bool self_test (); @@ -114,9 +114,6 @@ namespace Test /// IIOPTraits test status bool iiop_test_successful_; - /// Multi-threaded test status - bool mult_thr_test_successful_; - /// Endpoints hash table EndPoint endPoints_[1001]; }; 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;} |