diff options
Diffstat (limited to 'TAO/tests/DII_Collocation_Tests/oneway')
6 files changed, 28 insertions, 61 deletions
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index ca5c1aa295a..71bbf2b35ee 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -25,7 +25,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { @@ -203,8 +203,6 @@ Client_Task::svc (void) req = obj->_request ("shutdown"); req->send_oneway (); - - } catch (const CORBA::Exception& ex) { @@ -220,7 +218,6 @@ Client_Task::svc (void) } return 0; - } CORBA::ULong diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h index cb4e4fdb7e6..130bb198807 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, const ACE_TCHAR *simple_test_ior, @@ -22,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 628c447dbe2..4d4d797c70f 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND; } // Implementation skeleton constructor -Test_Simple_Test_i::Test_Simple_Test_i (void) +Test_Simple_Test_i::Test_Simple_Test_i () { } // Implementation skeleton destructor -Test_Simple_Test_i::~Test_Simple_Test_i (void) +Test_Simple_Test_i::~Test_Simple_Test_i () { } @@ -269,7 +269,7 @@ void Hello::test_args_3 ( } char * -Hello::get_string (void) +Hello::get_string () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -324,7 +324,7 @@ Hello::test_unbounded_string ( } void -Hello::shutdown (void) +Hello::shutdown () { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep @@ -339,4 +339,3 @@ CORBA::ULong Hello::error_count () const } - diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index 8fc53671693..6114cf258d2 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -10,15 +10,13 @@ class Test_Simple_Test_i { public: //Constructor - Test_Simple_Test_i (void); + Test_Simple_Test_i (); //Destructor - virtual ~Test_Simple_Test_i (void); + virtual ~Test_Simple_Test_i (); virtual - void test_method ( - ::CORBA::ULong & error_count - ); + void test_method (::CORBA::ULong & error_count); }; /// Implement the Test::Hello interface @@ -32,92 +30,66 @@ public: // = The skeleton methods virtual - void test_basic_arg ( - ::CORBA::Long basic - ); + void test_basic_arg (::CORBA::Long basic); virtual - void test_unbounded_string_arg ( - const char * message - ); + void test_unbounded_string_arg (const char * message); virtual - void test_bounded_string_arg ( - const char * message - ); + void test_bounded_string_arg (const char * message); virtual - void test_fixed_array_arg ( - const ::Test::Fixed_Array message - ); + void test_fixed_array_arg (const ::Test::Fixed_Array message); virtual - void test_var_array_arg ( - const ::Test::Var_Array messages - ); + void test_var_array_arg (const ::Test::Var_Array messages); virtual - void test_bounded_var_size_arg ( - const ::Test::Bounded_Var_Size_Arg & message - ); + void test_bounded_var_size_arg (const ::Test::Bounded_Var_Size_Arg & message); virtual - void test_unbounded_var_size_arg ( - const ::Test::Unbounded_Var_Size_Arg & message - ); + void test_unbounded_var_size_arg (const ::Test::Unbounded_Var_Size_Arg & message); virtual - void test_fixed_size_arg ( - const ::Test::TimeOfDay & t - ); + void test_fixed_size_arg (const ::Test::TimeOfDay & t); virtual - void test_special_basic_arg ( - ::CORBA::Char value - ); + void test_special_basic_arg (::CORBA::Char value); virtual - void test_objref_arg ( - ::Test::Simple_Test_ptr test - ); + void test_objref_arg (::Test::Simple_Test_ptr test); virtual - void test_object_arg ( - ::CORBA::Object_ptr o - ); + void test_object_arg (::CORBA::Object_ptr o); virtual void test_args_1 ( ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, - ::Test::Simple_Test_ptr arg3 - ); + ::Test::Simple_Test_ptr arg3); virtual void test_args_2 ( const char * arg1, const ::Test::Fixed_Array arg2, - const ::Test::TimeOfDay & arg3 - ); + const ::Test::TimeOfDay & arg3); virtual void test_args_3 ( const char * arg1, const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, - const ::Test::Var_Array arg4 - ); + const ::Test::Var_Array arg4); - virtual char * get_string (void); + virtual char * get_string (); virtual char * test_unbounded_string ( const char * s1, char *& s2, - CORBA::String_out s3 - ); + CORBA::String_out s3); - virtual void shutdown (void); + virtual void shutdown (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp index 8c44fd06667..31d7959a269 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -19,7 +19,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h index 6e6d7085452..fde0740eebe 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h @@ -28,7 +28,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; |