diff options
Diffstat (limited to 'TAO/tests')
1039 files changed, 4085 insertions, 10541 deletions
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 60dbc3e8da3..34ffc46f424 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -12,15 +12,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -33,7 +30,6 @@ main (int argc, char *argv[]) ACE_TRY { Test::Timestamp time = 10; roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH(Test::ServerOverload, ov) { diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 4bc543e5537..0a124577673 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -51,7 +51,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, ACE_TRY { _tao_rh->test_method_excep (&holder ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL {} @@ -120,10 +119,8 @@ ST_AMH_Server::~ST_AMH_Server () ACE_TRY_NEW_ENV { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -141,11 +138,9 @@ ST_AMH_Server::start_orb_and_poa (void) this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -154,14 +149,11 @@ ST_AMH_Server::start_orb_and_poa (void) this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY { @@ -179,12 +171,10 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; (void) this->write_ior_to_file (ior); } @@ -205,9 +195,7 @@ ST_AMH_Server::run_event_loop () while (!this->orb_->orb_core ()->has_shutdown ()) { this->orb_->perform_work (&period); - ACE_TRY_CHECK; } - ACE_TRY_CHECK; } ACE_CATCHANY {} diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp index 381cc74f8b8..2e88cf01777 100644 --- a/TAO/tests/AMH_Oneway/client.cpp +++ b/TAO/tests/AMH_Oneway/client.cpp @@ -31,18 +31,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -59,7 +56,6 @@ main (int argc, char *argv[]) for (int i = 0; i < num_calls; i++) { roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i)); } diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 29d8037da8d..75b4004ae8e 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -143,10 +143,8 @@ ST_AMH_Server::cleanup () ACE_TRY_NEW_ENV { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -164,11 +162,9 @@ ST_AMH_Server::start_orb_and_poa (void) this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -177,14 +173,11 @@ ST_AMH_Server::start_orb_and_poa (void) this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY { @@ -202,12 +195,10 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; (void) this->write_ior_to_file (ior); } @@ -228,13 +219,11 @@ ST_AMH_Server::run_event_loop () while (1) { this->orb_->perform_work (&period); - ACE_TRY_CHECK; // when all calls from client have been recieved, exit if (calls_received == num_calls ) return; } - ACE_TRY_CHECK; } ACE_CATCHANY {} diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index 313677c07a1..2366e264897 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -55,7 +55,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void -AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); @@ -63,7 +63,7 @@ AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Long -AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Test_i::yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index 66ce22677fe..9db507d5835 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -36,10 +36,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, A::DidTheRightThing)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Long yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)); void yadda (CORBA::Long yadda diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index dfebe21b163..4115fa32919 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -122,8 +122,7 @@ public: "Callback method <foo_excep> called: \n")); ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCHANY { @@ -131,7 +130,6 @@ public: "Caught exception:"); } ACE_ENDTRY; - ACE_CHECK; }; void get_yadda (CORBA::Long result @@ -151,7 +149,7 @@ public: "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void set_yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -195,18 +193,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; A::AMI_Test_var server = A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -220,7 +215,6 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -229,14 +223,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Let the client perform the test in a separate thread @@ -263,13 +254,11 @@ main (int argc, char *argv[]) while (number_of_replies > 0) { CORBA::Boolean pending = - orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->work_pending(); if (pending) { - orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->perform_work(); } } @@ -290,10 +279,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -329,7 +316,6 @@ Client::svc (void) number, "Let's talk AMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (debug) { diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index b2868cd1e58..5b4b5a0523c 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -59,11 +59,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,11 +70,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +80,10 @@ main (int argc, char *argv[]) AMI_Test_i ami_test_i (orb.in ()); A::AMI_Test_var ami_test_var = - ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_test_i._this (); CORBA::String_var ior = orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,19 +100,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 2a22d5164ed..fc9c9b722df 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -97,8 +97,7 @@ public: "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCH (A::DidTheRightThing, ex) { @@ -112,7 +111,6 @@ public: "... caught the wrong exception -> ERROR\n")); } ACE_ENDTRY; - ACE_CHECK; }; @@ -133,7 +131,7 @@ public: "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void set_yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -175,33 +173,26 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object_var = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa_var = PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_var->the_POAManager (); - poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager_var->activate (); if (parse_args (argc, argv) != 0) return 1; // We reuse the object_var smart pointer! object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; A::AMI_Test_var ami_test_var = A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ami_test_var.in ())) { @@ -214,8 +205,7 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler._this (); // Try out sending asynchronous messages without a reply handler // registered. Things fail if we get an exception. @@ -224,7 +214,6 @@ main (int argc, char *argv[]) 0, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Trigger the DidTheRightThing exception on the server side // by sending 0 to it. @@ -235,7 +224,6 @@ main (int argc, char *argv[]) 0, "Let's talk AMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long l = 931247; @@ -249,22 +237,18 @@ main (int argc, char *argv[]) l, "Let's talk AMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Begin test of attributes ami_test_var->sendc_get_yadda (the_handler_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ami_test_var->sendc_set_yadda (the_handler_var.in (), 4711 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ami_test_var->sendc_get_yadda (the_handler_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // End test of attributes @@ -289,7 +273,6 @@ main (int argc, char *argv[]) l, "Let's talk SMI." ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (debug) { @@ -300,17 +283,14 @@ main (int argc, char *argv[]) if (shutdown_flag) { - ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_test_var->shutdown (); } poa_var->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -319,7 +299,6 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index aaaaf5b0cd2..06c2646234a 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -37,7 +37,6 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload { AMI_Buffering::Nest_Guard ng(*this); this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -45,42 +44,38 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload } ACE_ENDTRY; - this->try_shutdown(ACE_ENV_SINGLE_ARG_PARAMETER); + this->try_shutdown(); } void -AMI_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering::flush (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -AMI_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL) +AMI_Buffering::sync (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->admin_->flush (); } void -AMI_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL) +AMI_Buffering::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->must_shutdown_ = true; - this->try_shutdown(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->try_shutdown(); } void -AMI_Buffering::try_shutdown(ACE_ENV_SINGLE_ARG_DECL) +AMI_Buffering::try_shutdown(void) { if (!this->must_shutdown_ || this->nest_ > 0) return; if (this->max_nest_ > 1) ACE_DEBUG ((LM_DEBUG, "(%P|%t) max nesting level: %d\n", max_nest_)); this->admin_->shutdown(ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index 57b8390347c..9da7fce9aab 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -22,17 +22,17 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (ACE_ENV_SINGLE_ARG_DECL) + virtual void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (ACE_ENV_SINGLE_ARG_DECL) + virtual void sync (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// internal implementation of shutdown. This - void try_shutdown (ACE_ENV_SINGLE_ARG_DECL); + void try_shutdown (void); class Nest_Guard { diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index d196dc0674d..10f02433a07 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -13,14 +13,14 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) } CORBA::ULong -AMI_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::request_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong -AMI_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; @@ -36,15 +36,14 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length } void -AMI_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::flush (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -AMI_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +AMI_Buffering_Admin::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index 904b4253ec5..1f75cf5f205 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -17,20 +17,20 @@ public: AMI_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong request_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_received (CORBA::ULong payload_length ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (ACE_ENV_SINGLE_ARG_DECL) + virtual void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp index 6f49c529d36..cbf41c79279 100644 --- a/TAO/tests/AMI_Buffering/Client_Task.cpp +++ b/TAO/tests/AMI_Buffering/Client_Task.cpp @@ -31,7 +31,6 @@ Client_Task::svc (void) // run the even loop for 1 second... ACE_Time_Value tv (1, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); if (this->terminate_loop_ != 0) diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp index 7c8a210d9d3..e8596bf670d 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -10,7 +10,7 @@ Reply_Handler::Reply_Handler (void) } void -Reply_Handler::receive_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::receive_data (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -22,8 +22,7 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder { ACE_TRY { - holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + holder->raise_exception (); } ACE_CATCHANY { @@ -34,7 +33,7 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder } void -Reply_Handler::sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::sync (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -46,8 +45,7 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder { ACE_TRY { - holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + holder->raise_exception (); } ACE_CATCHANY { @@ -58,7 +56,7 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder } void -Reply_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -70,8 +68,7 @@ Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder { ACE_TRY { - holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + holder->raise_exception (); } ACE_CATCHANY { diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index 9d73cbcc70d..be6cb13121e 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -17,19 +17,19 @@ public: Reply_Handler (void); // = The skeleton methods - virtual void receive_data (ACE_ENV_SINGLE_ARG_DECL) + virtual void receive_data (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_data_excep (::Messaging::ExceptionHolder *holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (ACE_ENV_SINGLE_ARG_DECL) + virtual void sync (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sync_excep (::Messaging::ExceptionHolder *holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown_excep (::Messaging::ExceptionHolder *holder ACE_ENV_ARG_DECL) diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index 9c883a1d3f5..673c71c43eb 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl); Test::AMI_Buffering_Admin_var AMI_buffering_admin = - AMI_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + AMI_buffering_admin_impl->_this (); CORBA::String_var ior = orb->object_to_string (AMI_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 2e05c13f86e..83ee301c399 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -121,15 +121,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -137,22 +134,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::AMI_Buffering_var ami_buffering = Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ami_buffering.in ())) { @@ -164,11 +157,9 @@ main (int argc, char *argv[]) tmp = orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::AMI_Buffering_Admin_var ami_buffering_admin = Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ami_buffering_admin.in ())) { @@ -193,7 +184,6 @@ main (int argc, char *argv[]) ami_buffering.in (), ami_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_timeout_test) { @@ -204,7 +194,6 @@ main (int argc, char *argv[]) ami_buffering.in (), ami_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_timeout_reactive_test) { @@ -215,7 +204,6 @@ main (int argc, char *argv[]) ami_buffering.in (), ami_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_buffer_size_test) { @@ -226,7 +214,6 @@ main (int argc, char *argv[]) ami_buffering.in (), ami_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -238,14 +225,11 @@ main (int argc, char *argv[]) client_task.thr_mgr ()->wait (); - ami_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_buffering->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -267,11 +251,9 @@ configure_policies (CORBA::ORB_ptr orb, { CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy_current.in ())) { @@ -289,21 +271,16 @@ configure_policies (CORBA::ORB_ptr orb, orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[0]->destroy (); + policies[1]->destroy (); TAO::BufferingConstraint flush_constraint; flush_constraint.mode = TAO::BUFFER_FLUSH; @@ -317,20 +294,16 @@ configure_policies (CORBA::ORB_ptr orb, orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); object = ami_buffering->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[0]->destroy (); flusher = Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } @@ -341,15 +314,12 @@ sync_server (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) { // Get back in sync with the server... - flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + flusher->flush (); + flusher->sync (); // Drain responses from the queue ACE_Time_Value tv (0, 100000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -365,11 +335,9 @@ run_liveness_test (CORBA::ORB_ptr orb, // Get back in sync with the server... sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong send_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); int liveness_test_iterations = int(send_count); ACE_DEBUG ((LM_DEBUG, " liveness_test_iterations = %d\n", @@ -386,16 +354,13 @@ run_liveness_test (CORBA::ORB_ptr orb, ami_buffering->sendc_receive_data (reply_handler, payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Once the system has sent enough messages we don't // expect it to fall too far behind, i.e. at least 90% of the @@ -413,13 +378,11 @@ run_liveness_test (CORBA::ORB_ptr orb, i, receive_count, expected)); sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } if (depth++ == LIVENESS_MAX_DEPTH) { sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); depth = 0; } @@ -445,7 +408,6 @@ run_message_count (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -462,18 +424,15 @@ run_message_count (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + reply_handler_impl->_this (); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -488,16 +447,13 @@ run_message_count (CORBA::ORB_ptr orb, ami_buffering->sendc_receive_data (reply_handler.in (), payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong iteration_count = send_count - initial_receive_count; @@ -537,7 +493,6 @@ run_message_count (CORBA::ORB_ptr orb, flusher.in (), ami_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -562,7 +517,6 @@ run_timeout (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -579,18 +533,15 @@ run_timeout (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + reply_handler_impl->_this (); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -606,16 +557,13 @@ run_timeout (CORBA::ORB_ptr orb, ami_buffering->sendc_receive_data (reply_handler.in (), payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -655,7 +603,6 @@ run_timeout (CORBA::ORB_ptr orb, flusher.in (), ami_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -680,7 +627,6 @@ run_timeout_reactive (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -697,18 +643,15 @@ run_timeout_reactive (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + reply_handler_impl->_this (); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -723,18 +666,15 @@ run_timeout_reactive (CORBA::ORB_ptr orb, ami_buffering->sendc_receive_data (reply_handler.in (), payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; } while (1) { CORBA::ULong receive_count = - ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -775,7 +715,6 @@ run_timeout_reactive (CORBA::ORB_ptr orb, flusher.in (), ami_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -802,7 +741,6 @@ run_buffer_size (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -817,18 +755,15 @@ run_buffer_size (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + reply_handler_impl->_this (); CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_bytes_received = - ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->bytes_received_count (); if (initial_bytes_received != bytes_sent) { @@ -843,16 +778,13 @@ run_buffer_size (CORBA::ORB_ptr orb, ami_buffering->sendc_receive_data (reply_handler.in (), payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = - ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ami_buffering_admin->bytes_received_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong payload_delta = bytes_sent - initial_bytes_received; @@ -897,7 +829,6 @@ run_buffer_size (CORBA::ORB_ptr orb, flusher.in (), ami_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index ba5fa487943..5eb416c79dd 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -47,15 +47,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -63,19 +60,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::AMI_Buffering_Admin_var admin = Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (admin.in ())) { @@ -93,12 +87,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl); Test::AMI_Buffering_var AMI_buffering = - AMI_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + AMI_buffering_impl->_this (); CORBA::String_var ior = orb->object_to_string (AMI_buffering.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -110,19 +102,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index e483bc5d871..50f0a8bb316 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -67,18 +67,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TimeoutObj_var timeout_var = TimeoutObj::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (timeout_var.in ())) { @@ -92,7 +89,6 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -101,21 +97,17 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeoutHandler_i._this (); // Instantiate client TimeoutClient client (orb.in (), @@ -127,20 +119,17 @@ main (int argc, char *argv[]) client.activate (); // ORB loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); // Fetch responses - ACE_TRY_CHECK; + orb->run (); // Fetch responses root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Wait for all the threads to finish before destroying the // ORB. (void) client.thr_mgr ()->wait (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index b26f765296d..0133cabfb53 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -59,11 +59,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,11 +70,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +80,10 @@ main (int argc, char *argv[]) Timeout_i timeout_i (orb.in ()); TimeoutObj_var timeout_var = - timeout_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeout_i._this (); CORBA::String_var ior = orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,15 +100,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeoutHandler_i._this (); // Instantiate client /* @@ -126,8 +118,7 @@ main (int argc, char *argv[]) client->activate (); */ - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -135,10 +126,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); //delete client; } diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 96322b4cf1d..5915ee346e6 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -64,15 +64,13 @@ TimeoutClient::svc () this->none_test (); // shut down remote ORB - timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeoutObject_->shutdown (); ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw ACE_OS::sleep (tv); // shut down local ORB orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -96,11 +94,9 @@ TimeoutClient::initialize () CORBA::Object_var object = orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager_ = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -193,14 +189,13 @@ TimeoutClient::send (CORBA::Boolean async, } ACE_ENDTRY; - ACE_CHECK; // get rid of the policy, you created before. ACE_TRY_EX (cleanup) { if (local_timeout != 0) { - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (); ACE_TRY_CHECK_EX (cleanup); } } @@ -210,7 +205,6 @@ TimeoutClient::send (CORBA::Boolean async, "Error: Unexpected exception\n\n")); } ACE_ENDTRY; - ACE_CHECK; // wait for responses ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000 + 4000); diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp index ff9fab96bd8..aea3b3444f6 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp @@ -48,7 +48,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec } void -Timeout_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Timeout_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (); @@ -72,7 +72,7 @@ TimeoutHandler_i::~TimeoutHandler_i () } void -TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TimeoutHandler_i::sendTimeToWait (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -90,8 +90,7 @@ TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_hold ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCH (CORBA::TIMEOUT, timeout) { diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h index d4082ac05d2..ed102627fe9 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.h +++ b/TAO/tests/AMI_Timeouts/timeout_i.h @@ -35,7 +35,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -51,7 +51,7 @@ public: ~TimeoutHandler_i (); - virtual void sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL) + virtual void sendTimeToWait (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sendTimeToWait_excep ( diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp index 0a26fb84775..8b06b2ef622 100644 --- a/TAO/tests/Abstract_Interface/client.cpp +++ b/TAO/tests/Abstract_Interface/client.cpp @@ -129,7 +129,6 @@ test_operation (base_ptr abs { CORBA::String_var retval = abs->base_op ("base_op" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) { @@ -142,11 +141,9 @@ test_operation (base_ptr abs foo_var concrete = foo::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; retval = concrete->foo_op ("foo_op" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) { @@ -157,7 +154,6 @@ test_operation (base_ptr abs retval = concrete->base_op ("base_op" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) { @@ -173,7 +169,6 @@ test_exception (base_ptr abs { CORBA::String_var retval = abs->base_op ("bad_name" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) { @@ -194,7 +189,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) { @@ -204,7 +198,6 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->string_to_object (ior_input_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) { @@ -215,7 +208,6 @@ main (int argc, char *argv[]) passer_var objref = passer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (objref.in ())) { @@ -237,7 +229,6 @@ main (int argc, char *argv[]) orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -249,7 +240,6 @@ main (int argc, char *argv[]) orb->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -261,12 +251,10 @@ main (int argc, char *argv[]) orb->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership objref->pass_state (package.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (package.in ())) { @@ -282,7 +270,6 @@ main (int argc, char *argv[]) { objref->pass_ops (package.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (package.in ())) { @@ -296,7 +283,6 @@ main (int argc, char *argv[]) { test_operation (package.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (which_test == TEST_EXCEPTION || which_test == TEST_ALL) @@ -304,11 +290,9 @@ main (int argc, char *argv[]) which_test = TEST_EXCEPTION; test_exception (package.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCH (BadInput, ex) { diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index 6a3c9034587..eb99476bc0c 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -45,7 +45,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create and register factory for BaseNode. BaseNode_init *bn_factory = 0; @@ -56,7 +55,6 @@ main (int argc, char *argv[]) orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -68,7 +66,6 @@ main (int argc, char *argv[]) orb->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -80,13 +77,11 @@ main (int argc, char *argv[]) orb->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -98,11 +93,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) { @@ -111,13 +104,11 @@ main (int argc, char *argv[]) passer_i servant; passer_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", @@ -142,22 +133,18 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Time_Value tv (10); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy the POA, waiting until the destruction terminates root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index a3e9072788b..964af0f9dcd 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -66,8 +66,7 @@ passer_i::pass_ops (base_out outarg ACE_NEW (servant, foo_i); PortableServer::ServantBase_var safety (servant); - outarg = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + outarg = servant->_this (); } void diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index d775aabc942..584665586f7 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -46,11 +46,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,11 +57,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -75,7 +71,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -85,30 +80,25 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -122,18 +112,15 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); Callback_var callback = - callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl._this (); // Send the calback object to the server server->callback_object (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // A method to kickstart callbacks from the server CORBA::Long r = server->test_method (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) { @@ -142,11 +129,9 @@ main (int argc, char *argv[]) r)); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index 02f3a672f43..d1ecad1ccc6 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,19 +81,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -112,16 +104,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), &server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -144,24 +133,20 @@ main (int argc, char *argv[]) // Just process one upcall. We know that we would get the // clients IOR in that call. CORBA::Boolean pending = - orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->work_pending(); if (pending) { - orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->perform_work(); } // Now that hopefully we have the clients IOR, just start // making remote calls to the client. - retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + retval = server_impl.call_client (); } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index 93a1a88ca4d..d4e45160e83 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -14,7 +14,7 @@ ACE_RCSID(BiDirectional, test_i, "$Id$") void -Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); @@ -55,14 +55,13 @@ Simple_Server_i::callback_object (Callback_ptr callback } int -Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::call_client (void) { if (this->flag_) { for (int times = 0; times < this->no_iterations_; ++times) { - this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->callback_method (); // If the cache size has gotten larger this indicates that // the connection isn't being shared properly, i.e., a new @@ -76,8 +75,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL) } } - this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->shutdown (); this->flag_ = 0; return 1; @@ -88,7 +86,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL) void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 9cf3cb4977c..7958d4fb10f 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -31,11 +31,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (ACE_ENV_SINGLE_ARG_DECL) + void callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -66,10 +66,10 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int call_client (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index a6b00269d1b..ad33e1782be 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,30 +81,25 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -127,19 +117,16 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); Callback_var callback = - callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl->_this (); // Send the calback object to the server server->callback_object (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Call the client that will make remote calls to us again, but // not directly, but delayed for a second or so. CORBA::Long r = server->test_method (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) { @@ -151,14 +138,11 @@ main (int argc, char *argv[]) // Run now the ORB for 5 seconds ACE_Time_Value run_time (5); orb->run (run_time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Shutdown the server - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp index ef4c284f576..457ef999087 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,19 +81,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -117,16 +109,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -144,13 +133,11 @@ main (int argc, char *argv[]) } // Run the event loop - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index b6c3bc56e36..e0b8233488c 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -14,7 +14,7 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void -Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); @@ -22,7 +22,7 @@ Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } void -Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Callback_i::callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -44,8 +44,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, times < this->no_iterations_; ++times) { - this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->callback_method (); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -56,8 +55,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, } } - this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->shutdown (); return 0; } @@ -99,7 +97,7 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (false ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index 30b355dcd9c..f78ba42db26 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -32,11 +32,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (ACE_ENV_SINGLE_ARG_DECL) + void callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -66,7 +66,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int handle_timeout (const ACE_Time_Value ¤t_time, diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index d4b0af3a3b9..7cbea7f62d4 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -36,21 +36,17 @@ test_with_bidir_poa (int argc, { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (); - ACE_TRY_CHECK; CORBA::PolicyList policies (1); policies.length (1); @@ -61,7 +57,6 @@ test_with_bidir_poa (int argc, orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -71,35 +66,29 @@ test_with_bidir_poa (int argc, poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (destroy_orb) { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception raised"); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 184e7ebda37..2299c38d181 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,30 +81,25 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -127,19 +117,16 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); Callback_var callback = - callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl->_this (); // Send the calback object to the server server->callback_object (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Call the client that will make remote calls CORBA::Long r = server->test_method (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) { @@ -149,11 +136,9 @@ main (int argc, char *argv[]) } // Shutdown the server - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index ef4c284f576..457ef999087 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,19 +81,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -117,16 +109,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -144,13 +133,11 @@ main (int argc, char *argv[]) } // Run the event loop - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 6544ddbfbda..eefbbaae959 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -13,7 +13,7 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void -Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); @@ -46,8 +46,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback times < this->no_iterations_; ++times) { - this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->callback_method (); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -73,7 +72,7 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 8573f7a0a0b..37d75fcd5c3 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -31,11 +31,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (ACE_ENV_SINGLE_ARG_DECL) + void callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -65,7 +65,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp index 60f2c7559f3..ac46a38f13a 100644 --- a/TAO/tests/Big_AMI/ami_test_i.cpp +++ b/TAO/tests/Big_AMI/ami_test_i.cpp @@ -44,7 +44,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, } void -AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h index d61bf0db80f..1fd845370fd 100644 --- a/TAO/tests/Big_AMI/ami_test_i.h +++ b/TAO/tests/Big_AMI/ami_test_i.h @@ -36,7 +36,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 23391b5b797..8ee4b1990b0 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -109,8 +109,7 @@ public: "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCHANY { @@ -118,7 +117,6 @@ public: "... caught the wrong exception -> ERROR\n")); } ACE_ENDTRY; - ACE_CHECK; }; private: @@ -135,33 +133,26 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object_var = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa_var = PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_var->the_POAManager (); - poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager_var->activate (); if (parse_args (argc, argv) != 0) return 1; // We reuse the object_var smart pointer! object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; A::AMI_Test_var ami_test_var = A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ami_test_var.in ())) { @@ -174,8 +165,7 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler._this (); CORBA::Long l = 931247; A::Payload payload (payload_size); @@ -200,7 +190,6 @@ main (int argc, char *argv[]) "Let's talk AMI.", payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // We are just sending all requests, but we shouldn't get any replies @@ -229,7 +218,6 @@ main (int argc, char *argv[]) "Let's talk SMI.", payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (debug) { @@ -240,17 +228,14 @@ main (int argc, char *argv[]) if (shutdown_flag) { - ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_test_var->shutdown (); } poa_var->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -259,7 +244,6 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp index b2868cd1e58..5b4b5a0523c 100644 --- a/TAO/tests/Big_AMI/server.cpp +++ b/TAO/tests/Big_AMI/server.cpp @@ -59,11 +59,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,11 +70,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +80,10 @@ main (int argc, char *argv[]) AMI_Test_i ami_test_i (orb.in ()); A::AMI_Test_var ami_test_var = - ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ami_test_i._this (); CORBA::String_var ior = orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,19 +100,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 6b6b332a9cc..1cc9653db42 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -45,12 +45,11 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, message_count, this->peer_count_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) +Coordinator::shutdown_all_peers (void) { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; @@ -58,8 +57,7 @@ Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (*i)->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h index 7879e47752a..ae490a3fea2 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -29,7 +29,7 @@ public: ACE_ENV_ARG_DECL); /// Shutdown all the peers - void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL); + void shutdown_all_peers (void); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index b93f0e3f7b2..4827594d14f 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -32,14 +32,13 @@ Peer::create_session (Test::Session_Control_ptr control, message_count, peer_count), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Session::_nil ()); PortableServer::ServantBase_var transfer_ownership (session_impl); - return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return session_impl->_this (); } void -Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Peer::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h index 2a142889512..d3faaf28db4 100644 --- a/TAO/tests/Big_Oneways/Peer.h +++ b/TAO/tests/Big_Oneways/Peer.h @@ -27,7 +27,7 @@ public: CORBA::ULong peer_count ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index e6f77c212c6..5a46073900d 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -49,8 +49,7 @@ Session::svc (void) CORBA::ULong session_count = this->other_sessions_.length (); - this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connections (); for (; i != this->message_count_; ++i) { @@ -67,7 +66,6 @@ Session::svc (void) { this->other_sessions_[j]->receive_payload (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -80,7 +78,6 @@ Session::svc (void) } } this->terminate (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -92,16 +89,14 @@ Session::svc (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->_remove_ref (); return 0; } void -Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL) +Session::validate_connections (void) { CORBA::ULong session_count = this->other_sessions_.length (); @@ -111,8 +106,7 @@ Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->other_sessions_[j]->ping (); } ACE_CATCHANY { @@ -145,14 +139,12 @@ Session::start (const Test::Session_List &other_sessions // access to this object.... ACE_TRY { - this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_add_ref (); if (this->task_.activate ( THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_remove_ref (); } else { @@ -172,8 +164,7 @@ Session::start (const Test::Session_List &other_sessions return; } - this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->validate_connections (); this->barrier_.wait (); @@ -186,7 +177,7 @@ Session::start (const Test::Session_List &other_sessions } void -Session::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) +Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -234,19 +225,16 @@ Session::receive_payload (const Test::Payload &the_payload void -Session::destroy (ACE_ENV_SINGLE_ARG_DECL) +Session::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index ef408f81679..13577bbce93 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -41,14 +41,14 @@ public: Test::Already_Running, Test::No_Peers)); - virtual void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_payload (const Test::Payload &the_payload ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,7 +63,7 @@ private: /// Make sure that all threads have connections avaiable to the /// other sessions. - void validate_connections (ACE_ENV_SINGLE_ARG_DECL); + void validate_connections (void); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index 12f3c2d7566..f34179bc9bb 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -63,13 +63,10 @@ Session_Control::session_finished (CORBA::Boolean success if (session_count_ == 0) { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 13465fab43c..6c93cc0348e 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,19 +54,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Coordinator_var coordinator = Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) { @@ -86,25 +80,20 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var peer_owner_transfer(peer_impl); Test::Peer_var peer = - peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + peer_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 9aa9d7a7522..35d83b375e1 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -66,15 +66,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,8 +79,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -94,12 +90,10 @@ main (int argc, char *argv[]) 1); Test::Coordinator_var coordinator = - coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coordinator_impl->_this (); CORBA::String_var ior = orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -111,8 +105,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); for (int i = 0; @@ -121,7 +114,6 @@ main (int argc, char *argv[]) { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -140,8 +132,7 @@ main (int argc, char *argv[]) 1); Test::Session_Control_var session_control = - session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_control_impl->_this (); Test::Session_List session_list; coordinator_impl->create_session_list (session_control.in (), @@ -150,7 +141,6 @@ main (int argc, char *argv[]) message_count, session_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (session_list.length () == peer_count); @@ -174,7 +164,6 @@ main (int argc, char *argv[]) session_list[j]->start (other_sessions ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } @@ -186,7 +175,6 @@ main (int argc, char *argv[]) { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (!session_control_impl->all_sessions_finished ()) @@ -200,23 +188,19 @@ main (int argc, char *argv[]) for (j = 0; j != peer_count; ++j) { - session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_list[j]->destroy (); } ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n")); - coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coordinator_impl->shutdown_all_peers (); ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 8e580b23939..7edf4deb0c8 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -32,13 +32,13 @@ public: virtual ~Big_Reply_i (void); // = The skeleton methods - virtual Test::Octet_Seq *get_big_reply (ACE_ENV_SINGLE_ARG_DECL) + virtual Test::Octet_Seq *get_big_reply (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index 8b640303e68..0f65d6169a0 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -34,8 +34,7 @@ Client_Task::svc (void) for (int i = 0; i != this->event_count_; ++i) { Test::Octet_Seq_var dummy = - this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->reply_gen_->get_big_reply (); } } ACE_CATCHANY @@ -66,8 +65,7 @@ Client_Task::validate_connection (void) ACE_TRY { - this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->reply_gen_->ping (); } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 05651121792..8a825108629 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -39,18 +39,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Big_Reply_var reply_gen = Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (reply_gen.in ())) { @@ -74,11 +71,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n")); // Request the server to shutdown - reply_gen->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + reply_gen->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index b09fbd74a0b..b7b6a59226d 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) @@ -81,13 +77,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen); Test::Big_Reply_var big_reply = - big_reply_gen->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + big_reply_gen->_this (); CORBA::String_var ior = orb->object_to_string (big_reply.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -99,14 +93,12 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index 385bf7f0bc5..fa7e0375eb1 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -40,7 +40,6 @@ Client_Task::do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL) for (int i = 0; i != this->event_count_; ++i) { this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -53,7 +52,6 @@ Client_Task::do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_ for (int i = 0; i != this->event_count_; ++i) { this->payload_receiver_->sync_none_more_data (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -70,16 +68,13 @@ Client_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); CORBA::Object_var object = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any scope_as_any; scope_as_any <<= this->sync_scope_; @@ -91,12 +86,10 @@ Client_Task::svc (void) this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (this->sync_scope_ == Messaging::SYNC_NONE) this->do_sync_none_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER); @@ -119,7 +112,7 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (void) { ACE_TRY { @@ -127,7 +120,6 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) for (int i = 0; i != 100; ++i) { (void) this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index 81c8358c4a2..239e12701ea 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -36,7 +36,7 @@ public: private: /// Make sure that all threads have connections available to /// workaround bug 189 - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); + void validate_connection (void); void do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL); void do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index 321eed0bd4a..b3ec79aac4b 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -49,18 +49,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Payload_Receiver_var payload_receiver = Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (payload_receiver.in ())) { @@ -111,7 +108,6 @@ main (int argc, char *argv[]) { ACE_Time_Value tv (0, 100 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (task0.done() && task1.done() && task2.done()) break; } @@ -123,11 +119,9 @@ main (int argc, char *argv[]) { ACE_Time_Value tv(0, 100 * 1000); orb->run(tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 6b134f43f55..3d9d03a6a3b 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -51,11 +51,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -64,11 +62,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -80,12 +76,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); Test::Payload_Receiver_var payload_receiver = - payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + payload_receiver_impl->_this (); CORBA::String_var ior = orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -97,8 +91,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG((LM_DEBUG, "Server waiting for messages...\n")); @@ -114,7 +107,6 @@ main (int argc, char *argv[]) int sn_prev_count = sn_count; ACE_Time_Value tv(0, 100 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; count = payload_receiver_impl->count(); sn_count = payload_receiver_impl->count(true); if ((count < expected && count == prev_count) || @@ -157,10 +149,8 @@ main (int argc, char *argv[]) runtime.sec(), runtime.usec())); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); return result; } diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 6b6b332a9cc..1cc9653db42 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -45,12 +45,11 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, message_count, this->peer_count_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) +Coordinator::shutdown_all_peers (void) { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; @@ -58,8 +57,7 @@ Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (*i)->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h index f229f2d0951..2c2a34d282c 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -28,7 +28,7 @@ public: ACE_ENV_ARG_DECL); /// Shutdown all the peers - void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL); + void shutdown_all_peers (void); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index b93f0e3f7b2..4827594d14f 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -32,14 +32,13 @@ Peer::create_session (Test::Session_Control_ptr control, message_count, peer_count), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Session::_nil ()); PortableServer::ServantBase_var transfer_ownership (session_impl); - return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return session_impl->_this (); } void -Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Peer::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index 2a142889512..d3faaf28db4 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -27,7 +27,7 @@ public: CORBA::ULong peer_count ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index a8aac013d5d..0a9452934c1 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -64,7 +64,6 @@ Session::svc (void) Test::Payload_var received = this->other_sessions_[j]->echo_payload (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -77,7 +76,6 @@ Session::svc (void) } } this->terminate (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -116,14 +114,12 @@ Session::start (const Test::Session_List &other_sessions // access to this object.... ACE_TRY { - this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_add_ref (); if (this->task_.activate ( THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_remove_ref (); } else { @@ -143,8 +139,7 @@ Session::start (const Test::Session_List &other_sessions return; } - this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->validate_connections (); this->barrier_.wait (); @@ -154,7 +149,6 @@ Session::start (const Test::Session_List &other_sessions /// None of the threads are running, this session is useless at /// this point, report the problem and destroy the local objects this->terminate (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Test::Payload * @@ -199,26 +193,22 @@ Session::echo_payload (const Test::Payload &the_payload return retval._retn (); } this->terminate (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return retval._retn (); } void -Session::destroy (ACE_ENV_SINGLE_ARG_DECL) +Session::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -233,7 +223,7 @@ Session::more_work (void) const } void -Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL) +Session::validate_connections (void) ACE_THROW_SPEC (()) { const CORBA::ULong session_count = @@ -246,11 +236,9 @@ Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL) CORBA::PolicyList_var unused; this->other_sessions_[j]->_validate_connection (unused ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #else (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_MESSAGING == 1 */ } ACE_CATCHANY diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index 94f1f349458..d7fbdd8e69c 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -42,7 +42,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -60,7 +60,7 @@ private: int more_work (void) const; /// Validate all the connections - void validate_connections (ACE_ENV_SINGLE_ARG_DECL) + void validate_connections (void) ACE_THROW_SPEC (()); private: diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp index 5b5c2e8ee44..490edf84696 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -63,13 +63,10 @@ Session_Control::session_finished (CORBA::Boolean success if (session_count_ == 0) { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 48013a64c34..6c93cc0348e 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,19 +54,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Coordinator_var coordinator = Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) { @@ -86,26 +80,20 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var peer_owner_transfer(peer_impl); Test::Peer_var peer = - peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + peer_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 0dcf180b51a..b8a809f77e7 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -66,15 +66,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,8 +79,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -94,12 +90,10 @@ main (int argc, char *argv[]) 1); Test::Coordinator_var coordinator = - coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coordinator_impl->_this (); CORBA::String_var ior = orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -111,8 +105,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); for (int i = 0; @@ -121,7 +114,6 @@ main (int argc, char *argv[]) { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -140,8 +132,7 @@ main (int argc, char *argv[]) 1); Test::Session_Control_var session_control = - session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_control_impl->_this (); Test::Session_List session_list; coordinator_impl->create_session_list (session_control.in (), @@ -150,7 +141,6 @@ main (int argc, char *argv[]) message_count, session_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (session_list.length () == peer_count); ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -173,7 +163,6 @@ main (int argc, char *argv[]) session_list[j]->start (other_sessions ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } @@ -186,7 +175,6 @@ main (int argc, char *argv[]) { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (!session_control_impl->all_sessions_finished ()) @@ -200,15 +188,13 @@ main (int argc, char *argv[]) for (j = 0; j != peer_count; ++j) { - session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_list[j]->destroy (); } ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n")); - coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coordinator_impl->shutdown_all_peers (); coordinator_impl->_remove_ref(); session_control_impl->_remove_ref(); @@ -216,10 +202,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index 864452afefb..f549f38b0c5 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -22,7 +22,7 @@ Blocking_Sync_None::slow_operation (const Test::Payload &, } void -Blocking_Sync_None::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Blocking_Sync_None::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 65a0714374f..423ac842001 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -22,7 +22,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index 2bff1936b7b..49fe51a87e4 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -49,18 +49,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Blocking_Sync_None_var blocking_sync_none = Test::Blocking_Sync_None::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (blocking_sync_none.in ())) ACE_ERROR_RETURN ((LM_DEBUG, @@ -70,11 +67,9 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -89,14 +84,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); const int payload_length = 65536; const unsigned int sleep_milliseconds = 20; @@ -114,7 +106,6 @@ main (int argc, char *argv[]) blocking_sync_none->slow_operation (payload, sleep_microseconds ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value elapsed = ACE_OS::gettimeofday (); elapsed -= start; @@ -125,11 +116,9 @@ main (int argc, char *argv[]) } } - blocking_sync_none->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + blocking_sync_none->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); if (blocked_calls > iterations / 20) { diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index a774b6cdf83..03eeda03140 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl); Test::Blocking_Sync_None_var blocking_sync_none = - blocking_sync_none_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + blocking_sync_none_impl->_this (); CORBA::String_var ior = orb->object_to_string (blocking_sync_none.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp index b29d2a35687..52f2916ba6a 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp @@ -18,8 +18,7 @@ Client_Task::svc (void) ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index b1922f2d3e3..f655354c4ea 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -32,7 +32,7 @@ Echo_Caller::start_task(Test::Echo_ptr client } void -Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h index f7d2688fabd..54b90175c3d 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h @@ -19,7 +19,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp index 6e68c8b1c98..538195d07db 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp @@ -29,7 +29,6 @@ Server_Task::svc (void) { this->echo_->echo_payload (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -37,7 +36,6 @@ Server_Task::svc (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); ACE_NOTREACHED (return 0); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 7deb646b538..9a344d4bfc9 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -48,17 +48,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,18 +63,15 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -94,15 +88,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -121,18 +112,15 @@ main (int argc, char *argv[]) } Test::Echo_var echo = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (echo.in ())) { @@ -142,14 +130,12 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Client_Task ctask (orb.in ()); server->start_task (echo.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ctask.activate (THR_NEW_LWP | THR_JOINABLE, 4, @@ -169,10 +155,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 4f62134a66f..5dca3937b4c 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -46,17 +46,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -64,8 +61,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,13 +80,11 @@ main (int argc, char *argv[]) } Test::Echo_Caller_var server = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -102,11 +96,9 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); @@ -114,10 +106,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp index 86bdeedf8b3..6a73f8d408b 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp @@ -22,8 +22,7 @@ ORB_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run(); } ACE_CATCH(CORBA::Exception, ex) { diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index d3f158f31da..6e9ca1d48bf 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -29,7 +29,6 @@ Server_Task::svc (void) Test::Payload_var result = this->echo_->echo_payload (pload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index 63209f90483..3019729ab21 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -33,17 +33,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,16 +48,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -75,14 +69,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -101,18 +92,15 @@ main (int argc, char *argv[]) } Test::Echo_var echo = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Server_var server = Test::Server::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (echo.in ())) { @@ -122,8 +110,7 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Crasher crasher; @@ -140,7 +127,6 @@ main (int argc, char *argv[]) { server->start_task(echo.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } task.wait(); @@ -149,10 +135,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index c71b63fba8c..7a71e62d37b 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -33,17 +33,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,12 +48,10 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -75,13 +70,11 @@ main (int argc, char *argv[]) } Test::Server_var server = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -93,8 +86,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ORB_Task task(orb.in()); task.activate(THR_NEW_LWP | THR_JOINABLE, 4, 1); @@ -105,10 +97,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp index e5cd2a202e5..76751139346 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp +++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp @@ -11,7 +11,7 @@ BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb) } /// Implement the BlobServer interface -void +void BlobServerImpl::test( BlobType1& blob1, BlobType2& blob2 @@ -35,7 +35,7 @@ BlobServerImpl::test( } void -BlobServerImpl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +BlobServerImpl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h index 89d707bac6d..a113f088564 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.h +++ b/TAO/tests/Bug_1254_Regression/BlobServer.h @@ -24,7 +24,7 @@ public: ACE_THROW_SPEC (( ::CORBA::SystemException )); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp index 10167eb8195..79d2f2acb46 100644 --- a/TAO/tests/Bug_1254_Regression/client.cpp +++ b/TAO/tests/Bug_1254_Regression/client.cpp @@ -38,14 +38,12 @@ int main(int argc, char* argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; BlobServer_var blobServer = BlobServer::_narrow(tmp.in()); if(CORBA::is_nil(blobServer.in())) @@ -94,11 +92,9 @@ int main(int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown\n")); - blobServer->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + blobServer->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp index 6f4f48cd03f..75fcaf9f749 100644 --- a/TAO/tests/Bug_1254_Regression/server.cpp +++ b/TAO/tests/Bug_1254_Regression/server.cpp @@ -40,15 +40,12 @@ int main(int argc, char** argv) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +53,7 @@ int main(int argc, char** argv) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ int main(int argc, char** argv) PortableServer::ServantBase_var owner_transfer(blob_impl); BlobServer_var blob = - blob_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + blob_impl->_this (); CORBA::String_var ior = orb->object_to_string (blob.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,19 +80,15 @@ int main(int argc, char** argv) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp index 2a8e075b4de..d9e58008e93 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp @@ -32,7 +32,7 @@ Echo_Caller::start_task(Test::Echo_ptr client } void -Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h index f9185f51576..bd37e452e06 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h @@ -19,7 +19,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp index 7182d663207..34021c71895 100644 --- a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp @@ -22,8 +22,7 @@ ORB_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run(); } ACE_CATCH(CORBA::Exception, ex) { diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp index 66fbce3ae34..ba69beb0473 100644 --- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp @@ -45,7 +45,6 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) echo->echo_payload (pload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value tv (0, 20000); this->reactor()->schedule_timer (this, 0, tv); diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 50b19d24f84..3cdfecd57f9 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -23,17 +23,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -41,16 +38,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -65,14 +59,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -91,18 +82,15 @@ main (int argc, char *argv[]) } Test::Echo_var echo = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (echo.in ())) { @@ -112,25 +100,20 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); server->start_task(echo.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index 2e89b271b31..87b6b639a4b 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -21,17 +21,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -39,12 +36,10 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -63,13 +58,11 @@ main (int argc, char *argv[]) } Test::Echo_Caller_var server = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,20 +74,16 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp index e48142df37f..44eb9d5d759 100644 --- a/TAO/tests/Bug_1269_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp @@ -18,7 +18,6 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -26,12 +25,10 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,11 +38,9 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp index a208f05a8ed..cb89caf8cc8 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -32,7 +32,7 @@ Echo_Caller::start_task(Test::Echo_ptr client } void -Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h index cff3dec424e..1e59359fb83 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h @@ -20,7 +20,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp index a011e89137d..212bd3ea422 100644 --- a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp @@ -22,8 +22,7 @@ ORB_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCH (CORBA::Exception, ex) { diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp index 7deb4156030..3b6d54efa63 100644 --- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp @@ -48,7 +48,6 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) echo->echo_payload (pload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 8405b2d1c0c..4370c64aa77 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -24,17 +24,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -42,16 +39,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -66,14 +60,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -92,18 +83,15 @@ main (int argc, char *argv[]) } Test::Echo_var echo = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (echo.in ())) { @@ -113,25 +101,20 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); server->start_task(echo.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index 361b06dd275..33549291602 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -21,17 +21,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -39,12 +36,10 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -63,13 +58,11 @@ main (int argc, char *argv[]) } Test::Echo_Caller_var server = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,20 +74,16 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp index 68026a71eec..d4635a921d2 100644 --- a/TAO/tests/Bug_1270_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp @@ -18,7 +18,6 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -26,12 +25,10 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,11 +38,9 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp index 70ccbb17d47..fee6cd16303 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp @@ -14,7 +14,7 @@ Test_i::~Test_i() } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Noop diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h index acaff8a29b1..e87b72d2120 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.h +++ b/TAO/tests/Bug_1330_Regression/Test_i.h @@ -18,7 +18,7 @@ public: ~Test_i (void); /// A method - void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void test_method(void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp index f317731aeae..ebaae788c4e 100644 --- a/TAO/tests/Bug_1330_Regression/client.cpp +++ b/TAO/tests/Bug_1330_Regression/client.cpp @@ -43,18 +43,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -65,13 +62,11 @@ main (int argc, char *argv[]) } - server->test_method(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method(); result =0; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index 63308e1c36c..60e0f87f466 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -43,11 +43,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,11 +54,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,22 +67,17 @@ main (int argc, char *argv[]) root_poa->activate_object ( &server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Object_var server = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var server = server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; adapter->bind("Name-with-hyphens", ior.in()); @@ -107,11 +98,9 @@ main (int argc, char *argv[]) poa_manager->activate(); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp index d6d17bcbfa3..da4be180497 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp @@ -28,7 +28,7 @@ Echo_Caller::start_task(Test::Echo_ptr client } void -Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h index a251e021d88..ed70e9dcc3d 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h @@ -22,7 +22,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp index 16ccdeb8661..7c0af881a1c 100644 --- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp @@ -23,8 +23,7 @@ ORB_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCH (CORBA::Exception, ex) { diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index a1183f7bd9c..fc08f3b5e7f 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -147,7 +147,6 @@ Thread_Pool::svc (void) ACE_OS::memset (pload.get_buffer(), pload.length(), 0); echo->echo_payload (pload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else @@ -156,7 +155,6 @@ Thread_Pool::svc (void) Test::Payload_var pout; echo->echo_payload_out (pout.out() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // time_t last_success = ACE_OS::time(); } diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index 76b98781048..f8e173815b0 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -56,17 +56,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -74,16 +71,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -98,14 +92,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -124,18 +115,15 @@ main (int argc, char *argv[]) } Test::Echo_var echo = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -145,8 +133,7 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ORB_Task worker (orb.in()); worker.activate (THR_NEW_LWP | THR_JOINABLE, @@ -169,8 +156,7 @@ main (int argc, char *argv[]) Client_Timer * task = new Client_Timer (orb->orb_core()->reactor()); task->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); worker.wait (); @@ -180,10 +166,8 @@ main (int argc, char *argv[]) // Actually the code here should never be reached. root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 5b09f46aa76..d8ec6ecb7ee 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -23,17 +23,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -41,13 +38,11 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -69,13 +64,11 @@ main (int argc, char *argv[]) } Test::Echo_Caller_var server = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,15 +80,13 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ORB_Task worker (orb.in ()); worker.activate (THR_NEW_LWP | THR_JOINABLE, 4); - orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); @@ -106,10 +97,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index 6ea9d05e4e3..644cf12476e 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -31,7 +31,6 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -39,12 +38,10 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_Caller_var server = Test::Echo_Caller::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -54,11 +51,9 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp index 7e153576cd6..9d231fbb14a 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp @@ -31,11 +31,9 @@ Client_Task::svc (void) // Apply sync_none policy CORBA::Object_var object = orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -50,21 +48,17 @@ Client_Task::svc (void) orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); for (int i = 0; i != number_; ++i) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) sending oneway invocation %d...\n", i)); - this->sender_->send_ready_message (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sender_->send_ready_message (); // Do it slowly. ACE_OS::sleep(ACE_Time_Value(0,250000)); diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp index 3a7769ee7fe..d8d5e553379 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp +++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp @@ -23,7 +23,7 @@ Sender_i::active_objects (CORBA::ULong no_threads void -Sender_i::send_ready_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Sender_i::send_ready_message (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index 387a467f8fd..14322034e9d 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -36,7 +36,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_ready_message (ACE_ENV_SINGLE_ARG_DECL) + virtual void send_ready_message (void) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong get_number_received (void) const; diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp index c2dbb8c52ba..f5b5ba2c278 100644 --- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp @@ -23,7 +23,6 @@ Server_Task::svc (void) // run the test for at most 30 seconds... ACE_Time_Value tv (15, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp index f08edccd51d..3fa3442af8f 100644 --- a/TAO/tests/Bug_1476_Regression/client.cpp +++ b/TAO/tests/Bug_1476_Regression/client.cpp @@ -57,11 +57,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,19 +68,15 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy_current.in ())) { @@ -97,13 +91,10 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -111,11 +102,9 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Sender_var sender = Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) { @@ -138,7 +127,6 @@ main (int argc, char *argv[]) // this is the first oneway we do, so after this we would have a queue // on one of the transports sender->active_objects ((CORBA::Short) number_of_client_tasks ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO::Transport_Cache_Manager& manager = orb->orb_core()->lane_resources ().transport_cache (); @@ -182,8 +170,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Event Loop finished\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); if (tranportwithqueue == false) { diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index b65d5e2333c..8e48650bd2f 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -45,11 +45,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,11 +56,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -74,12 +70,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); Test::Sender_var sender = - sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sender_impl->_this (); CORBA::String_var ior = orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -91,8 +85,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (orb.in (), ACE_Thread_Manager::instance ()); @@ -126,10 +119,8 @@ main (int argc, char *argv[]) } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp index 9710790c0af..d6edf70052d 100644 --- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp @@ -43,20 +43,17 @@ Client_Task::svc (void) { this->receiver_->sendc_next_prime (this->handler_var_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } CORBA::Short repl = 0; while (repl != 25) { CORBA::Boolean pending = - this->orb_->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->work_pending (); if (pending) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->perform_work (); ++repl; } diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp index 40d7a6c63e7..6575cb0bdca 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.cpp +++ b/TAO/tests/Bug_1482_Regression/Hello.cpp @@ -18,7 +18,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } CORBA::ULong -Hello::next_prime (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::next_prime (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h index 58a5fd909b3..7d7fe72e65a 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.h +++ b/TAO/tests/Bug_1482_Regression/Hello.h @@ -17,7 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong next_prime (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong next_prime (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index 93189526614..b35f3854035 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -23,8 +23,7 @@ Reply_Handler::next_prime_excep ( ACE_TRY { - ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ex->raise_exception (); } ACE_CATCH (CORBA::COMM_FAILURE, t) { @@ -34,10 +33,8 @@ Reply_Handler::next_prime_excep ( ACE_Time_Value tv (10, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -45,5 +42,4 @@ Reply_Handler::next_prime_excep ( "Caught exception:"); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp index 8c0dc31bdd1..50d733ca3e7 100644 --- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp @@ -19,8 +19,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index 78a8635a4e5..d994f66207c 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -42,18 +42,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -65,28 +62,22 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TimeBase::TimeT timeout_period = 10 * 1000; @@ -99,12 +90,10 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeout_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Let the client perform the test in a separate thread @@ -123,10 +112,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 2204fc213da..8d35961807b 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,8 +83,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task st (orb.in (), ACE_Thread_Manager::instance ()); @@ -102,16 +95,13 @@ main (int argc, char *argv[]) return -1; } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index fa080db4265..5a85d13a10f 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -29,8 +29,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -39,13 +38,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp index 51150d118a7..d4454dac1d2 100644 --- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp @@ -28,12 +28,10 @@ Client_Task::svc (void) { CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Bug1495_Regression::Bug1495_var server = Bug1495_Regression::Bug1495::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -51,7 +49,6 @@ Client_Task::svc (void) CORBA::Long remote_thread_id; server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Remote thread ID was %i\n", diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp index 9993a624d7f..103c5aee788 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp @@ -31,14 +31,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index acaf0e35779..97046329a4b 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -35,7 +35,6 @@ Server_Task::svc (void) { CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -46,14 +45,11 @@ Server_Task::svc (void) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Bug1495_i *server_impl = 0; ACE_NEW_RETURN (server_impl, @@ -66,7 +62,6 @@ Server_Task::svc (void) CORBA::String_var ior = sorb_->object_to_string (bug1495.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (output_ != 0) { @@ -94,13 +89,11 @@ Server_Task::svc (void) // The ORB will run for 15 seconds and shut down. ACE_Time_Value tv (15, 0); sorb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished for the thread server.\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -109,7 +102,6 @@ Server_Task::svc (void) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (1); return 0; } diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp index 99bb3239dfc..46172fabcaa 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp @@ -74,7 +74,6 @@ main (int argc, char *argv[]) main_args_s.get_TCHAR_argv (), "Server_ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; @@ -99,7 +98,6 @@ main (int argc, char *argv[]) main_args_c.get_TCHAR_argv (), "Client_ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; { Client_Task client_task (ior_input_file, @@ -115,8 +113,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp index 95cd68db7e7..a42807639fc 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -60,16 +60,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Remote_Server_ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -80,14 +77,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) { @@ -109,7 +103,6 @@ main (int argc, char *argv[]) // Pull in the ior from the remote server to use as the forward location. CORBA::Object_var forward_location = orb->string_to_object (ior_input_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (forward_location.in ())) { @@ -121,27 +114,22 @@ main (int argc, char *argv[]) server_interceptor->forward_reference (forward_location.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Bug1495_i server_impl (orb.in ()); PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Bug1495_Regression::Bug1495_var server = Bug1495_Regression::Bug1495::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the server IOR to a file if (ior_output_file != 0) @@ -163,7 +151,6 @@ main (int argc, char *argv[]) ACE_Time_Value tv (15, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server_interceptor->forward_location_done() == false) { @@ -172,7 +159,6 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished \n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp index fc019f046ed..cd5c24da242 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h index 2503a4b75b7..5ee9a220c42 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index c4a32357087..545156c3359 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -43,14 +43,14 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -63,8 +63,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -131,8 +130,7 @@ Echo_Server_Request_Interceptor::send_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h index f1f682be9f9..874eb6a5f5b 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h @@ -37,11 +37,11 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp index f79564cc0dd..0fba4bb193e 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.cpp +++ b/TAO/tests/Bug_1495_Regression/test_i.cpp @@ -49,10 +49,8 @@ Bug1495_i::shutdown ( "Shutting down orb %i\n", ACE_Thread::self())); - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index db21e2a6abb..7550249543c 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -54,7 +54,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc index 354a6efdb94..0ed4112568a 100644 --- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc +++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc @@ -5,5 +5,6 @@ project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_co exename = bug_1535_regression Source_Files { bug_1535_regression.cpp + Test.cpp } } diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp new file mode 100644 index 00000000000..55daf8fcfc4 --- /dev/null +++ b/TAO/tests/Bug_1535_Regression/Test.cpp @@ -0,0 +1,24 @@ +// +// $Id$ +// +#include "Test.h" + +ACE_RCSID(Hello, Hello, "$Id$") + +Hello::Hello (PortableServer::POA_ptr poa) : + poa_ (PortableServer::POA::_duplicate (poa)) +{ +} + +void +Hello::print_hello_world (void) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + +PortableServer::POA_ptr +Hello::_default_POA (void) +{ + return PortableServer::POA::_duplicate (this->poa_.in ()); +} + diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h new file mode 100644 index 00000000000..42bccb4ce91 --- /dev/null +++ b/TAO/tests/Bug_1535_Regression/Test.h @@ -0,0 +1,29 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Hello + : public virtual POA_Test +{ +public: + Hello (PortableServer::POA_ptr poa); + + // = The skeleton methods + virtual void print_hello_world (void) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::POA_ptr _default_POA (void); + +private: + PortableServer::POA_var poa_; +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp index 1bec57c8fde..3745e6bad19 100644 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "TestS.h" +#include "Test.h" #include "tao/Utils/ORB_Destroyer.h" #include "tao/Utils/RIR_Narrow.h" #include "tao/Utils/PolicyList_Destroyer.h" @@ -21,22 +21,18 @@ create_persistent_POA (PortableServer::POA_ptr parent, plist[0] = parent->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); plist[1] = parent->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); plist[2] = parent->create_implicit_activation_policy ( PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var mgr = - parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + parent->the_POAManager (); return parent->create_POA (name, mgr.in(), @@ -55,21 +51,18 @@ test_create_object_before_servant_reactivation ( create_persistent_POA(root_poa, "T1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId ("TestServant"); - char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + char const * id = _tc_Test->id (); CORBA::Object_var object = persistent_poa->create_reference_with_id ( oid.in (), id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (object.in ())) { @@ -82,7 +75,6 @@ test_create_object_before_servant_reactivation ( CORBA::String_var ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Now destroy the POA... persistent_poa->destroy (true, @@ -93,13 +85,11 @@ test_create_object_before_servant_reactivation ( create_persistent_POA (root_poa, "T1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // And try to create the object again... object = orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if(CORBA::is_nil (object.in ())) { @@ -111,7 +101,6 @@ test_create_object_before_servant_reactivation ( persistent_poa->destroy (true, true ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -125,19 +114,16 @@ test_create_object_before_POA_reactivation( create_persistent_POA (root_poa, "T2" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId ("TestServant"); - char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + char const * id = _tc_Test->id (); CORBA::Object_var object = persistent_poa->create_reference_with_id (oid.in (), id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (object.in ())) { @@ -149,18 +135,15 @@ test_create_object_before_POA_reactivation( CORBA::String_var ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Now destroy the POA... persistent_poa->destroy (true, true ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // And try to create the object again... object = orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (object.in ())) { @@ -173,13 +156,60 @@ test_create_object_before_POA_reactivation( persistent_poa->destroy (true, true ACE_ENV_ARG_PARAMETER); - ACE_CHECK; +} + +void +test_no_implicit_activation ( + PortableServer::POA_ptr root_poa + ACE_ENV_ARG_DECL) +{ + // Create a persistent POA and then create a reference in it... + PortableServer::POA_var persistent_poa = + create_persistent_POA (root_poa, + "T3" + ACE_ENV_ARG_PARAMETER); + + Hello myhello (persistent_poa.in ()); + + bool succeed = false; + ACE_TRY_NEW_ENV + { + // Implicit activation should fail + Test_var myservant = + myhello._this (); + + } + ACE_CATCH (PortableServer::POA::WrongPolicy, ex) + { + succeed = true; + } + ACE_CATCH (PortableServer::POA::ServantNotActive, ex) + { + // This is now the case when looking at the corba spec, raised + // an issue 10522 about this + succeed = true; + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + + if (!succeed) + { + ACE_ERROR ((LM_ERROR, + "(%t) ERROR, Implicit activation failed with invalid exception\n")); + } + + // Now destroy the POA... + persistent_poa->destroy (true, + true + ACE_ENV_ARG_PARAMETER); } int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + ACE_DECLARE_NEW_ CORBA_ENV; ACE_TRY { @@ -188,7 +218,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO::Utils::ORB_Destroyer orb_destroyer (orb.in()); @@ -196,24 +225,22 @@ main (int argc, char *argv[]) TAO::Utils::RIR_Narrow<PortableServer::POA>::narrow (orb.in (), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_create_object_before_POA_reactivation (orb.in(), root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_create_object_before_servant_reactivation (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + + test_no_implicit_activation (root_poa.in () + ACE_ENV_ARG_PARAMETER); } ACE_CATCHANY { @@ -226,7 +253,6 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (1); return 0; } diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp index 75a9d31af82..ef782416b3a 100644 --- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp @@ -56,12 +56,10 @@ Client_Task::svc (void) { this->receiver_->sendc_short_sleep (this->handler_var_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_Time_Value tv(10, 0); orb_->run(tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TIMEOUT, ex) { diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp index 5c72639015f..bf29d0f14e3 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.cpp +++ b/TAO/tests/Bug_1551_Regression/Hello.cpp @@ -15,7 +15,7 @@ Hello::Hello( } void -Hello::short_sleep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::short_sleep (void) ACE_THROW_SPEC ((CORBA::SystemException)) { long count = atomic_counter_--; diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h index 156365e9b6b..9378352de1e 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.h +++ b/TAO/tests/Bug_1551_Regression/Hello.h @@ -16,7 +16,7 @@ public: /// Constructor Hello(CORBA::ORB_ptr orb, bool simulate_crashes); - virtual void short_sleep (ACE_ENV_SINGLE_ARG_DECL) + virtual void short_sleep (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp index c6f274953fe..75b9645d96b 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -15,18 +15,15 @@ Reply_Handler::Reply_Handler ( } void -Reply_Handler::short_sleep (ACE_ENV_SINGLE_ARG_DECL) +Reply_Handler::short_sleep (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - check_counter(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + check_counter(); Test::AMI_HelloHandler_var current = - _this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _this(); hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -35,15 +32,13 @@ Reply_Handler::short_sleep_excep ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - check_counter(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + check_counter(); ACE_TRY { if (ex) { - ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ex->raise_exception (); } else { @@ -62,25 +57,21 @@ Reply_Handler::short_sleep_excep ( #endif /* 0 */ } ACE_ENDTRY; - ACE_CHECK; Test::AMI_HelloHandler_var current = - _this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + _this(); hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void Reply_Handler:: -check_counter(ACE_ENV_SINGLE_ARG_DECL) +check_counter(void) { long const count = --counter_; if(count == 0) { // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n")); orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; return; } #if 0 diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 26ca559dd07..245e58a2bac 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -17,7 +17,7 @@ public: Test::Hello_ptr hello, CORBA::ORB_ptr orb); - void short_sleep (ACE_ENV_SINGLE_ARG_DECL) + void short_sleep (void) ACE_THROW_SPEC ((CORBA::SystemException)); void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder @@ -25,7 +25,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: - void check_counter(ACE_ENV_SINGLE_ARG_DECL); + void check_counter(void); private: ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_; diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp index 541faead41b..103d6710fc7 100644 --- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp @@ -19,8 +19,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index 1498c96ae47..32d46958498 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -52,18 +52,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -75,19 +72,15 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Let the client perform the test in a separate thread @@ -119,10 +112,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 5adc91117fd..064749f5da1 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -56,15 +56,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,8 +69,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -82,12 +78,10 @@ main (int argc, char *argv[]) new Hello(orb.in(), simulate_crashes)); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -99,8 +93,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task st (orb.in (), @@ -119,10 +112,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp index 44edda43ee7..4a637a9751c 100644 --- a/TAO/tests/Bug_1568_Regression/client.cpp +++ b/TAO/tests/Bug_1568_Regression/client.cpp @@ -47,18 +47,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Baz::C_var cobject = Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (cobject.in ())) { @@ -68,14 +65,10 @@ main (int argc, char *argv[]) 1); } - cobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - cobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - cobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - cobject->op4 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + cobject->op1 (); + cobject->op2 (); + cobject->op3 (); + cobject->op4 (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index fce73b267a5..fad92bf3786 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -63,7 +63,7 @@ Simple_C::op1( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op1(ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_rh->op1(); } void @@ -72,7 +72,7 @@ Simple_C::op2( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op2(ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_rh->op2(); } void @@ -81,7 +81,7 @@ Simple_C::op3( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op3(ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_rh->op3(); } void @@ -90,7 +90,7 @@ Simple_C::op4( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op4(ACE_ENV_SINGLE_ARG_PARAMETER); + _tao_rh->op4(); } // **************************************************************** @@ -130,15 +130,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -146,8 +143,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -156,12 +152,10 @@ main (int argc, char *argv[]) new Simple_C(orb.in())); Baz::C_var simple_c = - simple_c_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_c_impl->_this (); CORBA::String_var ior = orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -173,19 +167,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp index 70ccbb17d47..fee6cd16303 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp @@ -14,7 +14,7 @@ Test_i::~Test_i() } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Noop diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h index 43bcb9a548b..369ae33b782 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.h +++ b/TAO/tests/Bug_1627_Regression/Test_i.h @@ -18,7 +18,7 @@ public: ~Test_i (void); /// A method - void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void test_method(void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp index f317731aeae..ebaae788c4e 100644 --- a/TAO/tests/Bug_1627_Regression/client.cpp +++ b/TAO/tests/Bug_1627_Regression/client.cpp @@ -43,18 +43,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -65,13 +62,11 @@ main (int argc, char *argv[]) } - server->test_method(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method(); result =0; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 63308e1c36c..60e0f87f466 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -43,11 +43,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,11 +54,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,22 +67,17 @@ main (int argc, char *argv[]) root_poa->activate_object ( &server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Object_var server = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var server = server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; adapter->bind("Name-with-hyphens", ior.in()); @@ -107,11 +98,9 @@ main (int argc, char *argv[]) poa_manager->activate(); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp index 9db84a9a4f5..a8790222fe4 100644 --- a/TAO/tests/Bug_1635_Regression/client.cpp +++ b/TAO/tests/Bug_1635_Regression/client.cpp @@ -12,7 +12,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp index 51a28417346..1c920c02d28 100644 --- a/TAO/tests/Bug_1636_Regression/client.cpp +++ b/TAO/tests/Bug_1636_Regression/client.cpp @@ -14,18 +14,15 @@ int main (int argc, char* argv[]) CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"Get reference to the DynAny Factory\n")); CORBA::Object_var obj = orb->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var daf = DynamicAny::DynAnyFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; UnionIecs::S_i_num s_num; s_num.type_num = UnionIecs::E_type_num_called_party_number; @@ -41,14 +38,11 @@ int main (int argc, char* argv[]) DynamicAny::DynAny_var dynany1 = daf->create_dyn_any_from_type_code (UnionIecs::_tc_S_num ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; dynany1->from_any(MyAny1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var arg1 = - dynany1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany1->to_any (); ACE_DEBUG ((LM_DEBUG, "...done\n")); @@ -62,21 +56,17 @@ int main (int argc, char* argv[]) DynamicAny::DynAny_var dynany2 = daf-> create_dyn_any_from_type_code (UnionIecs::_tc_S_num ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; dynany2->from_any (MyAny2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var arg2 = - dynany2->to_any(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany2->to_any(); ACE_DEBUG ((LM_DEBUG,"...done.\nTest passed.\n")); // Finally destroy the ORB - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -85,7 +75,6 @@ int main (int argc, char* argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN(1); return 0; } diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp index bf5e3b6385c..77deff63371 100644 --- a/TAO/tests/Bug_1670_Regression/client.cpp +++ b/TAO/tests/Bug_1670_Regression/client.cpp @@ -47,18 +47,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Baz::C_var cobject = Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (cobject.in ())) { @@ -69,25 +66,20 @@ main (int argc, char *argv[]) } CORBA::Long result; - result = cobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = cobject->op1 (); ACE_ASSERT(result == 1); - result = cobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = cobject->op2 (); ACE_ASSERT(result == 2); - result = cobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = cobject->op3 (); ACE_ASSERT(result == 3); - result = cobject->op4 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = cobject->op4 (); ACE_ASSERT(result == 4); Foo::Bar::B_var bobject = Foo::Bar::B::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (bobject.in ())) { @@ -97,13 +89,11 @@ main (int argc, char *argv[]) 1); } - result = bobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = bobject->op3 (); ACE_ASSERT(result == 3); Foo::Bar::A_var aobject = Foo::Bar::A::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (aobject.in ())) { @@ -113,12 +103,10 @@ main (int argc, char *argv[]) 1); } - result = aobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = aobject->op1 (); ACE_ASSERT(result == 1); - result = aobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = aobject->op2 (); ACE_ASSERT(result == 2); } diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index ca6e5d7aebb..258ed248782 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -130,15 +130,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -146,8 +143,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -156,12 +152,10 @@ main (int argc, char *argv[]) new Simple_C(orb.in())); Baz::C_var simple_c = - simple_c_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_c_impl->_this (); CORBA::String_var ior = orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -173,19 +167,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp index b0afc671195..829bab08c33 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.cpp +++ b/TAO/tests/Bug_1676_Regression/Hello.cpp @@ -12,14 +12,14 @@ Hello::Hello (CORBA::ORB_ptr orb) #if 0 char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } #endif -::Test::StringList * +::Test::StringList * Hello::get_stringList ( // ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -43,7 +43,7 @@ Hello::get_stringList ( return seq; } -void +void Hello::get_stringList2 ( ::CORBA::Boolean initialize, ::Test::StringList_out osl @@ -59,7 +59,7 @@ Hello::get_stringList2 ( if (initialize) { ACE_NEW (osl, Test::StringList(10)); - + osl->length(5); for (CORBA::ULong i = 0; i<osl->length(); i++) { @@ -69,8 +69,8 @@ Hello::get_stringList2 ( } } } - -void + +void Hello::mod_stringList ( ::Test::StringList & iosl ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -89,9 +89,9 @@ Hello::mod_stringList ( } } } - + void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h index d7bd79aab93..fb9a433efcd 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.h +++ b/TAO/tests/Bug_1676_Regression/Hello.h @@ -32,7 +32,7 @@ public: ACE_THROW_SPEC (( ::CORBA::SystemException )); - + virtual void mod_stringList ( ::Test::StringList & iosl ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -40,8 +40,8 @@ public: ACE_THROW_SPEC (( ::CORBA::SystemException )); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp index 9687e3ec488..4652c1e2642 100644 --- a/TAO/tests/Bug_1676_Regression/client.cpp +++ b/TAO/tests/Bug_1676_Regression/client.cpp @@ -42,18 +42,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -66,8 +63,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList\n")); Test::StringList_var seq = - hello->get_stringList (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_stringList (); for (CORBA::ULong i = 0; i<seq->length(); i++) { CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]); @@ -79,7 +75,6 @@ main (int argc, char *argv[]) Test::StringList_var seq2; hello->get_stringList2(true, seq2.out()); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i<seq2->length(); i++) { CORBA::String_var the_string = seq2.in()[i]; @@ -94,7 +89,6 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - mod_stringList\n")); hello->mod_stringList(seq.inout()); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i<seq->length(); i++) { CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]); @@ -102,11 +96,9 @@ main (int argc, char *argv[]) the_string.in ())); } - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -127,7 +119,6 @@ void get_stringList2(Test::Hello_var hello) { // Shutdown the ORB and block until the shutdown is complete. hello->get_stringList2(false, seq2.out()); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i<seq2->length(); i++) { CORBA::String_var the_string = seq2.in()[i]; diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp index 177aad4d1d8..245c288e5c8 100644 --- a/TAO/tests/Bug_1676_Regression/server.cpp +++ b/TAO/tests/Bug_1676_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp index d95a5916742..bb7a278ba2f 100644 --- a/TAO/tests/Bug_1693_Test/client.cpp +++ b/TAO/tests/Bug_1693_Test/client.cpp @@ -19,18 +19,15 @@ main (int argc, char *argv[]) argv, "my_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain a reference to the CodecFactory. CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IOP::CodecFactory_var codec_factory = IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ---------------------------------------------------------- @@ -45,7 +42,6 @@ main (int argc, char *argv[]) IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ---------------------------------------------------------- { @@ -61,13 +57,11 @@ main (int argc, char *argv[]) encoded_data = codec->encode_value (tmp ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; decoded_data = codec->decode_value (encoded_data.in (), Foo::_tc_type_ulong ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Foo::type_ulong check = 0; diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 1bf4dbf8ace..6f79e221b55 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -30,12 +30,10 @@ Client_Task::svc (void) CORBA::Object_var poa_object = this->corb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -43,8 +41,7 @@ Client_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, @@ -54,9 +51,8 @@ Client_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); - Test::Hello_var hello_servant = hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); + Test::Hello_var hello_servant = hello_impl->_this (); + poa_manager->activate (); ACE_DEBUG((LM_DEBUG,"Client (%t) optimize_collocation_objects=%d use_global_collocation=%d\n", corb_->orb_core()->optimize_collocation_objects(), @@ -65,11 +61,9 @@ Client_Task::svc (void) CORBA::Object_var tmp = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::EventNode_var evNode= Test::EventNode::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (evNode.in ())) { @@ -82,10 +76,8 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n")); evNode->registerHello( hello_servant.in() ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; - evNode->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + evNode->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp index a16745c918a..42ddb1532f7 100644 --- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp +++ b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp @@ -68,7 +68,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -93,7 +92,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -110,12 +108,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } } ACE_CATCHANY diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp index 3ce3f1bf30e..5e141502dae 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.cpp +++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp @@ -53,7 +53,7 @@ void EventNode::registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL ) } void -EventNode::shutdown (ACE_ENV_SINGLE_ARG_DECL) +EventNode::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h index e2209a632ac..8cca1acd0c0 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.h +++ b/TAO/tests/Bug_2084_Regression/EventNode.h @@ -23,7 +23,7 @@ public: virtual void registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index e19ff455c09..fca984db1f5 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -57,7 +57,7 @@ Hello::get_string (::CORBA::Long caller_threadid ACE_ENV_ARG_DECL) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h index 30e9552d68c..0d101e8f91e 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.h +++ b/TAO/tests/Bug_2084_Regression/Hello.h @@ -23,7 +23,7 @@ public: virtual char * get_string ( ::CORBA::Long caller_threadid ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp index b5e9fb0ffce..60ec86dde6b 100644 --- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp @@ -32,12 +32,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -45,12 +43,11 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); EventNode *evnode_impl = new EventNode(this->sorb_.in(),ACE_Thread::self()); PortableServer::ServantBase_var owner_transfer(evnode_impl); - Test::EventNode_var evNode = evnode_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER); + Test::EventNode_var evNode = evnode_impl->_this(); ACE_DEBUG((LM_DEBUG,"Server (%t) optimize_collocation_objects=%d use_global_collocation=%d\n", sorb_->orb_core()->optimize_collocation_objects(), @@ -59,7 +56,6 @@ Server_Task::svc (void) CORBA::String_var ior = this->sorb_->object_to_string (evNode.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -73,14 +69,12 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp index e5979299664..a86453e161e 100644 --- a/TAO/tests/Bug_2134_Regression/Hello.cpp +++ b/TAO/tests/Bug_2134_Regression/Hello.cpp @@ -29,45 +29,34 @@ int main(int argc, char* argv[]) // Initialize the ORB orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // create Hello object Test::Hello_impl hello_i; - ACE_TRY_CHECK; Test::Hello_var hello = hello_i._this (); - ACE_TRY_CHECK; // give our object a friendly name CORBA::Object_var iorTableObj = orb->resolve_initial_references ("IORTable"); - ACE_TRY_CHECK; IORTable::Table_var iorTable = IORTable::Table::_narrow (iorTableObj.in ()); - ACE_TRY_CHECK; CORBA::String_var ior_string = orb->object_to_string (hello.in ()); - ACE_TRY_CHECK; iorTable->bind("hello", ior_string.in ()); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ior_string.in ())); // Get the root POA CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA"); - ACE_TRY_CHECK; PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ()); - ACE_TRY_CHECK; // Activate the POA manager PortableServer::POAManager_var poaManager = rootPOA->the_POAManager (); - ACE_TRY_CHECK; poaManager->activate (); - ACE_TRY_CHECK; // try and access the object with its friendly name ACE_CString full_corbaloc (ior_string.in (), 0, 1); @@ -83,7 +72,6 @@ int main(int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Trying to access object with object ref:\n%s\n", friendly_corbaloc.c_str ())); CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ()); - ACE_TRY_CHECK; TimeBase::TimeT timeout = 10000000; @@ -104,7 +92,6 @@ int main(int argc, char* argv[]) policy_list[0]->destroy(); Test::Hello_var hello2 = Test::Hello::_narrow (rtt_obj.in ()); - ACE_TRY_CHECK; if (CORBA::is_nil (hello2.in ())) { @@ -116,13 +103,11 @@ int main(int argc, char* argv[]) else { hello2->say_hello (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n")); } orb->destroy(); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp index dc0b7923d30..ac2fea6eda8 100644 --- a/TAO/tests/Bug_2174_Regression/client.cpp +++ b/TAO/tests/Bug_2174_Regression/client.cpp @@ -48,18 +48,15 @@ int main (int argc, char* argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -70,7 +67,6 @@ int main (int argc, char* argv[]) } CORBA::Boolean non_existent = server->_non_existent (); - ACE_TRY_CHECK; if (non_existent) result = 3; @@ -81,8 +77,7 @@ int main (int argc, char* argv[]) "client (%P) _non_existent() returned %d\n", static_cast<int>(non_existent) )); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp index bc39027c4ac..a41b92e88da 100644 --- a/TAO/tests/Bug_2174_Regression/server.cpp +++ b/TAO/tests/Bug_2174_Regression/server.cpp @@ -47,14 +47,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -63,21 +61,17 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (remove_object) { @@ -87,7 +81,6 @@ main (int argc, char *argv[]) "server (%P) deactivated object immediately\n" )); } - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -105,11 +98,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index 9f1bd8537bc..f3a30e0718c 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -28,7 +28,7 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h index 00018fa25d8..3a8aecfe32c 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.h +++ b/TAO/tests/Bug_2174_Regression/test_i.h @@ -35,7 +35,7 @@ public: CORBA::Long msecs ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 65df3934e3a..92d9f8df86d 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 7e1c3042968..78833d61a97 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/Hello.h @@ -22,10 +22,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 913d3153ae9..17efd26d1c1 100644 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -62,17 +59,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - //hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - //ACE_TRY_CHECK; + //hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 4853611a134..696c03be73a 100644 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -73,12 +69,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,19 +84,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp index c45f7947354..1a5a373af98 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.cpp +++ b/TAO/tests/Bug_2186_Regression/Hello.cpp @@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n")); @@ -19,7 +19,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h index cf49f8dc3de..0d038b5f615 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.h +++ b/TAO/tests/Bug_2186_Regression/Hello.h @@ -17,12 +17,12 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp index ca65ab90e14..f32b9ba7a88 100644 --- a/TAO/tests/Bug_2186_Regression/client.cpp +++ b/TAO/tests/Bug_2186_Regression/client.cpp @@ -44,18 +44,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -63,8 +60,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -73,12 +69,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,16 +84,13 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var tmp = orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var server = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -112,12 +103,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Sending client obj ref to the server and requesting a callback.\n")); server->request_callback (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Test (client) Succeeded !!!\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp index 5c7e9180f09..aa853887654 100644 --- a/TAO/tests/Bug_2186_Regression/server.cpp +++ b/TAO/tests/Bug_2186_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp index 093af6fc026..404368133c3 100644 --- a/TAO/tests/Bug_2188_Regression/client.cpp +++ b/TAO/tests/Bug_2188_Regression/client.cpp @@ -42,14 +42,12 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; saobj = ServerAdmin::_narrow (tmp.in() ACE_ENV_ARG_PARAMETER); @@ -61,18 +59,15 @@ main (int argc, char *argv[]) 1); } - ArrayTest_var atobj = saobj->target(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ArrayTest_var atobj = saobj->target(); CharArray_slice * char_array = CharArray_alloc(); for (int i = 0; i < 10; i++) char_array[i] = (char)('a' + i); atobj->a_charArray (char_array ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n")); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -83,6 +78,6 @@ main (int argc, char *argv[]) saobj->shutdown(); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (); return 0; } diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp index 01ef2b0eece..79c168441d4 100644 --- a/TAO/tests/Bug_2188_Regression/server.cpp +++ b/TAO/tests/Bug_2188_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,8 +67,7 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(target_servant); ArrayTest_var atobj = - target_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + target_servant->_this (); ServerAdmin_i *servant; ACE_NEW_RETURN (servant, ServerAdmin_i(atobj.in()),1); @@ -81,12 +76,10 @@ main (int argc, char *argv[]) owner_transfer = servant; ServerAdmin_var saobj = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); CORBA::String_var ior = orb->object_to_string (saobj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -98,19 +91,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp index 52180b29d5a..e410aa7df9b 100644 --- a/TAO/tests/Bug_2234_Regression/client.cpp +++ b/TAO/tests/Bug_2234_Regression/client.cpp @@ -20,13 +20,10 @@ main( { CORBA::ORB_var orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; CORBA::Object_var object= orb->string_to_object( "file://server.ior" ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; Test::Foo_var foo= Test::Foo::_narrow( object.in() ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; //----------------------------------------------------------------------- CORBA::Long @@ -36,7 +33,6 @@ main( rL= 0; ACE_DEBUG( (LM_INFO, ". Long() ") ); rL= foo->TestLong( aL, bL, cL ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d: ", aL, bL, cL, rL) ); if (static_cast<CORBA::Long>(1) != aL) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} @@ -57,7 +53,6 @@ main( rS; ACE_DEBUG( (LM_INFO, ". String() ") ); rS= foo->TestString( aS.in(), bS.out(), cS.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s: ", aS.in(), bS.in(), cS.in(), rS.in()) ); if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} @@ -80,7 +75,6 @@ main( cFS->val= 3; ACE_DEBUG( (LM_INFO, ". MyNonVarStruct() ") ); rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d: ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val) ); if (static_cast<CORBA::Long>(1) != aFS->val) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} @@ -103,7 +97,6 @@ main( cVS->val= CORBA::string_dup("3"); ACE_DEBUG( (LM_INFO, ". MyVarStruct() ") ); rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s: ", aVS->val.in(), bVS->val.in(), cVS->val.in(), rVS->val.in()) ); if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} @@ -126,7 +119,6 @@ main( cFU->valLong( static_cast<CORBA::Long>(3) ); ACE_DEBUG( (LM_INFO, ". MyNonVarUnion() ") ); rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is ") ); if (static_cast<CORBA::Short>(1) != aFU->_d()) ACE_DEBUG( (LM_INFO, "?") ); @@ -169,7 +161,6 @@ main( cVU->valLong( static_cast<CORBA::Long>(3) ); ACE_DEBUG( (LM_INFO, ". MyVarUnion() ") ); rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is ") ); if (static_cast<CORBA::Short>(1) != aVU->_d()) ACE_DEBUG( (LM_INFO, "?") ); @@ -214,7 +205,6 @@ main( cSL[0]= static_cast<CORBA::Long>(3); ACE_DEBUG( (LM_INFO, ". MySeqOfLong() ") ); rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is ") ); if (1u != aSL->length()) ACE_DEBUG( (LM_INFO, "?") ); @@ -257,7 +247,6 @@ main( cA<<= static_cast<CORBA::Long>(3); ACE_DEBUG( (LM_INFO, ". Any() ") ); rA= foo->TestAny( aA.in(), bA.out(), cA.inout() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Boolean aB, bB, @@ -297,13 +286,10 @@ main( //----------------------------------------------------------------------- foo->ShutdownServer( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; //----------------------------------------------------------------------- orb->shutdown( true ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; } ACE_CATCH( CORBA::SystemException, ex ) { diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp index c4bebf10c1b..fae6e08c3ca 100644 --- a/TAO/tests/Bug_2234_Regression/server.cpp +++ b/TAO/tests/Bug_2234_Regression/server.cpp @@ -425,7 +425,6 @@ public: { ACE_DEBUG( (LM_INFO, ". in ShutdownServer\n") ); orb->shutdown(0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } }; @@ -605,7 +604,6 @@ public: ACE_DEBUG( (LM_INFO, "AnInterceptor::receive_request\n") ); Dynamic::ParameterList *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; display_arg_list( pArgs ); } @@ -622,12 +620,10 @@ public: ACE_DEBUG( (LM_INFO, "AnInterceptor::send_reply\n") ); Dynamic::ParameterList *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; display_arg_list( pArgs ); ACE_DEBUG( (LM_INFO, " result is an ") ); CORBA::Any *pAny= ri->result( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; display_any( CORBA::Any_var( pAny ).in() ); ACE_DEBUG( (LM_INFO, "\n") ); } @@ -691,40 +687,30 @@ int main( int argc, char *argv[] ) PortableInterceptor::register_orb_initializer( initialiser.in() ); orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; CORBA::Object_var Object = orb->resolve_initial_references( "RootPOA" ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; PortableServer::POA_var rootPOA= PortableServer::POA::_narrow( Object.in() ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; PortableServer::POAManager_var rootPOAMgr = rootPOA->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; FooImpl phooey; PortableServer::ObjectId_var phooeyId= rootPOA->activate_object( &phooey ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; CORBA::Object_var phooeyObj= rootPOA->id_to_reference( phooeyId.in() ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; CORBA::String_var stringifiedObj= orb->object_to_string( phooeyObj.in() ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; ofstream file( "server.ior" ); file << stringifiedObj; file.close(); rootPOAMgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; orb->run( 0 ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; } ACE_CATCH( CORBA::SystemException, exception ) { diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp index cb82452c574..750710f613c 100644 --- a/TAO/tests/Bug_2289_Regression/client.cpp +++ b/TAO/tests/Bug_2289_Regression/client.cpp @@ -46,18 +46,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -65,8 +62,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -79,12 +75,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); MyInterface_var test_ref = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,16 +88,14 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (); ACE_TRY_CHECK CORBA::Object_var tmp = orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; MyInterface_var server = MyInterface::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -112,11 +104,10 @@ main (int argc, char *argv[]) ior.in()), 1); } - + CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + if (temp) { ACE_DEBUG ((LM_DEBUG, "Test succeeded\n")); @@ -125,13 +116,11 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_ERROR, "Test failed\n")); result = 1; - } + } - //hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - //ACE_TRY_CHECK; + //hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp index 47f749d99bd..05a8c455543 100644 --- a/TAO/tests/Bug_2289_Regression/server.cpp +++ b/TAO/tests/Bug_2289_Regression/server.cpp @@ -52,15 +52,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,8 +65,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -82,12 +78,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); MyInterface_var test_ref = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -97,17 +91,14 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -116,19 +107,15 @@ main (int argc, char *argv[]) else { adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 8bf1e026102..6b72212aa3e 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -160,7 +160,6 @@ ST_AMH_Server::~ST_AMH_Server () ACE_TRY_NEW_ENV { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -177,11 +176,9 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb) ACE_TRY_NEW_ENV { this->orb_ = CORBA::ORB::_duplicate(_orb.in ()); - ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -190,14 +187,11 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb) this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY { @@ -215,11 +209,9 @@ void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { ACE_TRY_NEW_ENV { - Test::Roundtrip_var roundtrip = servant->_this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::Roundtrip_var roundtrip = servant->_this(); CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ()); - ACE_TRY_CHECK; (void) this->write_ior_to_file(iorstr); } @@ -241,13 +233,11 @@ void ST_AMH_Server::run_event_loop () while (1) { this->orb_->perform_work (&period); - ACE_TRY_CHECK; // when all calls from client have been recieved, exit if (calls_received == num_calls ) return; } - ACE_TRY_CHECK; } ACE_CATCHANY {} @@ -299,7 +289,6 @@ Test::Timestamp time = 10; { roundtrip->test_method(time); ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i)); - ACE_TRY_CHECK; } return 0; @@ -316,7 +305,6 @@ int main (int argc, char *argv[]) ST_AMH_Server amh_server (&argc, argv); CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); - ACE_TRY_CHECK; amh_server.start_orb_and_poa(orb); @@ -325,10 +313,8 @@ ST_AMH_Servant servant(orb.in()); amh_server.register_servant(&servant); CORBA::Object_var object = orb->string_to_object(ior); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow(object.in ()); - ACE_TRY_CHECK; if (CORBA::is_nil(roundtrip.in())) { @@ -359,7 +345,6 @@ ST_AMH_Servant servant(orb.in()); printf("End server\n"); orb->destroy(); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp index ac4c1c6fe85..8b6858373f1 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.cpp +++ b/TAO/tests/Bug_2328_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_string (const char * A, const char * B, const char * C) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h index 4ef97cd1b6c..f799df7f7eb 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.h +++ b/TAO/tests/Bug_2328_Regression/Hello.h @@ -20,7 +20,7 @@ public: virtual char * get_string (const char * A, const char * B, const char * C ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp index d39919e7d85..8b4117f7883 100644 --- a/TAO/tests/Bug_2328_Regression/client.cpp +++ b/TAO/tests/Bug_2328_Regression/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -66,16 +63,13 @@ main (int argc, char *argv[]) CORBA::String_var C = CORBA::string_dup ("MV-files"); CORBA::String_var the_string = hello->get_string (A.in (), B.in (), C.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp index 69fe7692d76..6936acb1b7f 100644 --- a/TAO/tests/Bug_2328_Regression/server.cpp +++ b/TAO/tests/Bug_2328_Regression/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -73,12 +69,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,19 +84,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index 9e3b0abce15..2ceb1eaf6c8 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -39,7 +39,6 @@ foo_i::destroy () { // This should case an BAD_INV_ORDER exception this->orb_->destroy (); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) { diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index ded3a38e9d6..dd48cdffec1 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -15,7 +15,7 @@ class Reply_Handler } virtual void - childMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + childMethod (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -27,8 +27,7 @@ class Reply_Handler { ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCH (CORBA::SystemException, ex) { @@ -38,7 +37,7 @@ class Reply_Handler } virtual void - parentMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + parentMethod (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -55,8 +54,7 @@ class Reply_Handler ACE_TRY { ++parentMethod_excep_count; - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + excep_holder->raise_exception (); } ACE_CATCH (CORBA::INTERNAL, iex) { @@ -118,7 +116,6 @@ main(int argc, char *argv[]) { // Initialize the ORB. orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = client_parse_args(argc, argv); @@ -129,36 +126,29 @@ main(int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get an object reference from the nominated file object = orb->string_to_object (server_ior); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager(); - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate(); Child_var child = Child::_narrow (object.in() ACE_ENV_ARG_PARAMETER); Reply_Handler reply_handler_servant; AMI_ChildHandler_var reply_handler_object = - reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + reply_handler_servant._this (); // Invoke the AMI parentMethod child->sendc_parentMethod (reply_handler_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Loop until all replies have been received. while (reply_handler_servant.reply_count () == 0) @@ -168,10 +158,8 @@ main(int argc, char *argv[]) // Shutdown server. child->shutdown (); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 8059c43febb..8111a41efbb 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -41,21 +41,17 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return -1; @@ -63,13 +59,11 @@ main (int argc, char *argv[]) ChildServant servant (orb.in ()); Child_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) @@ -80,18 +74,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp index 25d1df2ae3d..5bc5f85acd0 100644 --- a/TAO/tests/Bug_2494_Regression/client.cpp +++ b/TAO/tests/Bug_2494_Regression/client.cpp @@ -81,7 +81,6 @@ struct Worker : ACE_Task_Base try { const char *ret = srv_->test_method (str); - ACE_TRY_CHECK; if (0 != ACE_OS::strcmp (str, ret)) return 1; } catch (CORBA::Exception& ex) diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp index 2d353c4ea24..4b65039192c 100644 --- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp +++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp @@ -41,7 +41,6 @@ int main (int argc, char* argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (1); return 0; } diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp index c023d511de6..84ac537d2d7 100644 --- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp +++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp @@ -67,7 +67,6 @@ int main (int argc, char* argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (1); return 0; } diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp index 7922fd05f71..b1ad877149b 100644 --- a/TAO/tests/Bug_2560_Regression/server.cpp +++ b/TAO/tests/Bug_2560_Regression/server.cpp @@ -55,7 +55,7 @@ int main (int argc, char* argv[]) // Creation of the new POAs over, so destroy the Policy_ptr's. for ( size_t i = 0 ; i < policies.length (); ++i ) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (); } // use this poa for making system objects diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.cpp +++ b/TAO/tests/Bug_2593_Regression/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.h +++ b/TAO/tests/Bug_2593_Regression/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp index f85722246b5..e4569d3dcce 100644 --- a/TAO/tests/Bug_2593_Regression/client.cpp +++ b/TAO/tests/Bug_2593_Regression/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -62,17 +59,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp index 3b309f50f0d..5ec046e3b26 100644 --- a/TAO/tests/Bug_2593_Regression/server.cpp +++ b/TAO/tests/Bug_2593_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp index b15677087ce..be88215aac9 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.cpp +++ b/TAO/tests/Bug_2595_Regression/Hello.cpp @@ -26,7 +26,7 @@ Hello::op ( } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h index 211615c355b..ead7d1ffced 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.h +++ b/TAO/tests/Bug_2595_Regression/Hello.h @@ -25,7 +25,7 @@ public: ::CORBA::SystemException )); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp index 9b3fa9bbc8f..d35b97353f6 100644 --- a/TAO/tests/Bug_2595_Regression/client.cpp +++ b/TAO/tests/Bug_2595_Regression/client.cpp @@ -42,18 +42,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -72,11 +69,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - op test 2\n")); hello->op(fstruct, vstruct.out()); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp index 177aad4d1d8..245c288e5c8 100644 --- a/TAO/tests/Bug_2595_Regression/server.cpp +++ b/TAO/tests/Bug_2595_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index b7ce8ac336a..02b60d5e5cb 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -27,7 +27,7 @@ const char *ior = "file://test.ior"; class Callback_i : public POA_Test::CallBack { public: - void method2(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void method2(void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n")); @@ -137,7 +137,6 @@ init_callback (Worker &w) { CORBA::Object_var obj = w.orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -146,11 +145,9 @@ init_callback (Worker &w) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -162,7 +159,6 @@ init_callback (Worker &w) w.orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -172,7 +168,6 @@ init_callback (Worker &w) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Callback_i *servant = new Callback_i; @@ -187,12 +182,10 @@ init_callback (Worker &w) i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); return 0; } diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp index 3b0c7e4528a..eab249d4952 100644 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ b/TAO/tests/Bug_2654_Regression/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -73,7 +69,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -83,15 +78,13 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } if (parse_args (argc, argv) != 0) @@ -105,18 +98,14 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = child_poa->activate_object(hello_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; obj = child_poa->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(obj.in() ACE_ENV_ARG_PARAMETER) - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -128,19 +117,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index f840ef82b8b..8729c0f9eb5 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -58,22 +58,17 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - ACE_TRY_CHECK; CORBA::Object_var object_var = orb->resolve_initial_references ("RootPOA"); - ACE_TRY_CHECK; PortableServer::POA_var poa_var = PortableServer::POA::_narrow (object_var.in ()); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = poa_var->the_POAManager (); - ACE_TRY_CHECK; poa_manager_var->activate (); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -154,7 +149,6 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return result; } diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp index 4dba7549ff4..e7119768255 100644 --- a/TAO/tests/Bug_2683_Regression/client.cpp +++ b/TAO/tests/Bug_2683_Regression/client.cpp @@ -106,7 +106,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp index f808568b8ea..28843cc512f 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.cpp +++ b/TAO/tests/Bug_2683_Regression/test_i.cpp @@ -10,14 +10,14 @@ test_i::test_i (ORB_Killer *k) } void -test_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown \n")); diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h index 45c844846f8..8bdf00fe6d6 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.h +++ b/TAO/tests/Bug_2683_Regression/test_i.h @@ -29,10 +29,10 @@ public: test_i (ORB_Killer *k); // = The skeleton methods - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp index 3b2d214029c..7605ec1bec5 100644 --- a/TAO/tests/Bug_2702_Regression/client.cpp +++ b/TAO/tests/Bug_2702_Regression/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -61,13 +58,11 @@ main (int argc, char *argv[]) 1); } - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); ACE_Time_Value duration(20, 0); orb->run(duration); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index a1035e4c150..e7afef42fbc 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -220,7 +220,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:l:"); int opt; diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 0b814f3d523..de850a80895 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -42,7 +42,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; static const CORBA::TypeCode_ptr tcs[]= { @@ -112,8 +111,7 @@ main (int argc, char *argv[]) { CORBA::TypeCode_ptr tc = *i; - CORBA::TCKind k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind k = tc->kind (); switch (k) { @@ -124,15 +122,12 @@ main (int argc, char *argv[]) case CORBA::tk_alias: case CORBA::tk_except: { - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const char *id = tc->id (); - const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const char *name = tc->name (); CORBA::ULong length = 0; // tc->length (TAO_TRY_ENV); - // ACE_TRY_CHECK; if (TAO_debug_level > 0) { diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp index c1b59fdeb10..f88a5184977 100644 --- a/TAO/tests/COIOP/COIOP_Test.cpp +++ b/TAO/tests/COIOP/COIOP_Test.cpp @@ -59,7 +59,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -83,7 +82,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -101,12 +99,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } } ACE_CATCHANY diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp index 47d9e5dd99c..b69065421e2 100644 --- a/TAO/tests/COIOP/Client_Task.cpp +++ b/TAO/tests/COIOP/Client_Task.cpp @@ -27,11 +27,9 @@ Client_Task::svc (void) CORBA::Object_var tmp = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -42,8 +40,7 @@ Client_Task::svc (void) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); @@ -54,8 +51,7 @@ Client_Task::svc (void) ACE_ERROR ((LM_ERROR, "(%P|%t) - ERROR: get_string should have failed\n")); } - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCH (CORBA::TRANSIENT, ex) { diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp index dd559fd879b..43a8b07fadc 100644 --- a/TAO/tests/COIOP/Hello.cpp +++ b/TAO/tests/COIOP/Hello.cpp @@ -16,7 +16,7 @@ ACE_RCSID(Hello, Hello, "$Id$") } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -59,7 +59,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h index ba9e6637812..63b4ec180be 100644 --- a/TAO/tests/COIOP/Hello.h +++ b/TAO/tests/COIOP/Hello.h @@ -20,10 +20,10 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp index 4ce551c4dc3..b4c7f3a40c6 100644 --- a/TAO/tests/COIOP/Server_Task.cpp +++ b/TAO/tests/COIOP/Server_Task.cpp @@ -31,12 +31,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +42,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -56,13 +53,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,15 +71,13 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); ACE_Time_Value runtime (10); this->sorb_->run (runtime); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp index 0fbab91f139..4bbb75efe7f 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp @@ -33,24 +33,17 @@ int ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - if (result != 0) + if (result != 0) { return result; } - ACE_CHECK_RETURN (-1); - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_clients(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->client_setup(); + this->poa_activate(); + this->run_clients(); + this->run_orb_event_loop(); // Calling wait on ACE_Thread_Manager singleton to avoid the problem // that the main thread might exit before all CSD Threads exit. @@ -68,7 +61,6 @@ int ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -81,24 +73,22 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) } TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::poa_setup(void) { - this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" + this->poa_ = this->create_poa(this->orb_.in(), + "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -108,46 +98,41 @@ ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; } void -ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::client_setup(void) { // Turn the ior_ into a Foo_B obj ref. Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + this->servants_.create_and_activate(1, // number of callback servants this->poa_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ServantListType::T_stub_var cb = this->servants_.objref(0); - // Create the ClientEngine object, and give it the Foo_B and Callback object + // Create the ClientEngine object, and give it the Foo_B and Callback object // references. - ClientEngine_Handle engine + ClientEngine_Handle engine = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_); this->client_task_.add_engine(engine.in()); } void -ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::poa_activate(void) { - PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POAManager_var poa_manager + = this->poa_->the_POAManager(); + poa_manager->activate(); } void -ClientApp::run_clients(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::run_clients(void) { if (this->client_task_.open() != 0) { @@ -157,11 +142,10 @@ ClientApp::run_clients(ACE_ENV_SINGLE_ARG_DECL) void -ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } @@ -171,15 +155,13 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL) { // Get the Root POA. PortableServer::POA_var root_poa - = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, + = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. - PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + PortableServer::POAManager_var poa_manager + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -191,7 +173,6 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL) poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h index 846384224f5..9447b7f619a 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h @@ -28,12 +28,12 @@ class ClientApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void client_setup(ACE_ENV_SINGLE_ARG_DECL); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); - void run_clients(ACE_ENV_SINGLE_ARG_DECL); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void client_setup(void); + void poa_activate(void); + void run_clients(void); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index e48955f8c06..3a8ec92aad6 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -35,26 +35,18 @@ int ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - if (result != 0) + if (result != 0) { return result; } - ACE_CHECK_RETURN (-1); - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->servant_setup(); + this->collocated_setup(); + this->poa_activate(); + this->run_collocated_clients(); + this->run_orb_event_loop(); // Calling wait on ACE_Thread_Manager singleton to avoid the problem // that the main thread might exit before all CSD Threads exit. @@ -71,7 +63,6 @@ int ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -87,31 +78,28 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) this->num_collocated_clients_; TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_setup(void) { - this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" + this->poa_ = this->create_poa(this->orb_.in(), + "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + if (this->num_collocated_clients_ > 0) { - this->cb_poa_ = this->create_poa(this->orb_.in(), - "CallbackPoa" + this->cb_poa_ = this->create_poa(this->orb_.in(), + "CallbackPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -124,11 +112,10 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; #endif // Use another poa and strategy for callbacks. This would resolve - // the deadlock situation that happens when having number of csd + // the deadlock situation that happens when having number of csd // threads less than number of collocated clients. if (this->num_collocated_clients_ > 0) { @@ -141,27 +128,25 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to callback poa.\n")); ACE_THROW(TestAppException()); - } - ACE_CHECK; + } #endif } } void -ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::servant_setup(void) { this->foo_servants_.create_and_activate(this->num_servants_, this->orb_.in (), this->poa_.in (), this->ior_filename_prefix_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::collocated_setup(void) { if (this->num_collocated_clients_ == 0) return; @@ -169,10 +154,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) this->cb_servants_.create_and_activate(1, // number of callback servants this->cb_poa_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0); - + unsigned client_id = this->num_remote_clients_; for (unsigned i = 0; i < this->num_collocated_clients_; i++) @@ -181,9 +165,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) // Dole out the servant object references in a round-robin fashion. unsigned servant_index = i % this->num_servants_; - FooServantListType::T_stub_var foo + FooServantListType::T_stub_var foo = this->foo_servants_.objref(servant_index); - ClientEngine_Handle engine + ClientEngine_Handle engine = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true); this->collocated_client_task_.add_engine(engine.in()); } @@ -191,18 +175,16 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_activate(void) { - PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POAManager_var poa_manager + = this->poa_->the_POAManager(); + poa_manager->activate(); } void -ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_collocated_clients(void) { if (this->num_collocated_clients_ > 0) { @@ -215,11 +197,10 @@ ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } @@ -332,7 +313,7 @@ ServerApp::usage_statement() int ServerApp::arg_dependency_checks() { - return (this->num_remote_clients_ + return (this->num_remote_clients_ + this->num_collocated_clients_) > 0 ? 0 : -1; } @@ -361,21 +342,19 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr -ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name +ServerApp::create_poa(CORBA::ORB_ptr orb, + const char* poa_name ACE_ENV_ARG_DECL) { // Get the Root POA. PortableServer::POA_var root_poa - = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" + = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, + "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. - PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + PortableServer::POAManager_var poa_manager + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -387,7 +366,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); @@ -400,7 +378,7 @@ ServerApp::check_validity () return true; #if 0 // Check whether the clients return any errors. - if (this->num_collocated_clients_ > 0 + if (this->num_collocated_clients_ > 0 && this->collocated_client_task_.failure_count () > 0) { return false; @@ -408,7 +386,7 @@ ServerApp::check_validity () Foo_B_Statistics stats (this->num_remote_clients_, this->num_collocated_clients_); - + Foo_B_SimpleClientEngine::expected_results (stats); for (unsigned i = 0; i < this->num_servants_; i++) diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h index c90b7671534..d976d13706e 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h @@ -28,13 +28,13 @@ class ServerApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void servant_setup(ACE_ENV_SINGLE_ARG_DECL); - void collocated_setup(ACE_ENV_SINGLE_ARG_DECL); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); - void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void servant_setup(void); + void collocated_setup(void); + void poa_activate(void); + void run_collocated_clients(void); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp index db2d1ec202e..50f77346388 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp @@ -14,7 +14,7 @@ AppHelper::ref_to_file(CORBA::ORB_ptr orb, if (ior_file == 0) { ACE_ERROR((LM_ERROR, - "(%P|%t) Cannot open output file [%s] to write IOR.", + "(%P|%t) Cannot open output file [%s] to write IOR.\n", filename)); ACE_THROW (TestAppException()); } @@ -35,7 +35,6 @@ AppHelper::create_poa(const char* name, mgr, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); if (CORBA::is_nil(child_poa.in())) { @@ -54,13 +53,11 @@ AppHelper::activate_servant(PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL) { // Activate the servant using the Child POA. - PortableServer::ObjectId_var oid + PortableServer::ObjectId_var oid = poa->activate_object(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - CORBA::Object_var obj + + CORBA::Object_var obj = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (CORBA::is_nil(obj.in())) { @@ -84,11 +81,9 @@ AppHelper::validate_connection (CORBA::Object_ptr obj) CORBA::PolicyList_var unused; obj->_validate_connection (unused ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #else obj->_is_a ("Not_An_IDL_Type" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_MESSAGING == 1 */ return true; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index 06a6ac721a2..7ba9b0320f5 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -16,12 +16,11 @@ struct RefHelper typedef typename T::_ptr_type T_ptr; typedef typename T::_var_type T_var; - static T_ptr string_to_ref(CORBA::ORB_ptr orb, - const char* ior + static T_ptr string_to_ref(CORBA::ORB_ptr orb, + const char* ior ACE_ENV_ARG_DECL) { CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(T::_nil ()); if (CORBA::is_nil(obj.in())) { @@ -31,7 +30,6 @@ struct RefHelper } T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(T::_nil ()); if (CORBA::is_nil(t_obj.in())) { @@ -43,13 +41,12 @@ struct RefHelper return t_obj._retn(); } - static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, + static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, const char* name ACE_ENV_ARG_DECL) { - CORBA::Object_var obj + CORBA::Object_var obj = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); if (CORBA::is_nil(obj.in())) { @@ -60,7 +57,6 @@ struct RefHelper } T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (T::_nil ()); if (CORBA::is_nil(t_obj.in())) diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h index 3fdd3efd233..272b1829c89 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h @@ -32,7 +32,7 @@ class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_ ClientEngine(); virtual ~ClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual bool execute(void) = 0; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp index 00d92a17608..82b8f9d0d4d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp @@ -65,8 +65,7 @@ ClientTask::svc() ACE_TRY_NEW_ENV { - bool exec_ret = engine->execute(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + bool exec_ret = engine->execute(); if (exec_ret == false) { GuardType guard(this->lock_); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp index 0cc9c9bd5ad..1ac399990c7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp @@ -17,7 +17,7 @@ OrbRunner::~OrbRunner() void -OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL) +OrbRunner::run(void) { ACE_ASSERT(this->num_orb_threads_ > 0); @@ -27,8 +27,7 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL) { // Since the num_orb_threads_ is exactly one, we just use the current // (mainline) thread to run the ORB event loop. - this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->run(); } else { @@ -47,8 +46,7 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL) } // This will use the current (mainline) thread to run the ORB event loop. - this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->run(); // Now that the current thread has unblocked from running the orb, // make sure to wait for all of the worker threads to complete. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h index 71c7c4e358c..8e3f8138239 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h @@ -12,7 +12,7 @@ class CSD_TP_Test_Export OrbRunner OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); virtual ~OrbRunner(); - void run(ACE_ENV_SINGLE_ARG_DECL); + void run(void); private: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp index 79ba1ba3f5e..632ea664649 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp @@ -54,7 +54,6 @@ OrbShutdownTask::svc() ACE_TRY_NEW_ENV { this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp index ff6ad717898..0610310ce91 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp @@ -77,8 +77,7 @@ OrbTask::svc() { ACE_TRY_NEW_ENV { - this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run(); } ACE_CATCHALL { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp index 2727c975253..8c06ff82ee9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp @@ -19,7 +19,7 @@ ServantList<T>::~ServantList() template <typename T> void ServantList<T>::create_and_activate(unsigned num_servants, - CORBA::ORB_ptr orb, + CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, const char* ior_fname_prefix ACE_ENV_ARG_DECL) @@ -28,22 +28,19 @@ ServantList<T>::create_and_activate(unsigned num_servants, { char buf[32]; ACE_OS::sprintf(buf, "%02d", i + 1); - ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior"; + ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior"; ServantRecord record; record.servant_ = new T(); record.safe_servant_ = record.servant_; - CORBA::Object_var obj - = AppHelper::activate_servant(poa, + CORBA::Object_var obj + = AppHelper::activate_servant(poa, record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + + AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(record.obj_.in())) { @@ -67,14 +64,12 @@ ServantList<T>::create_and_activate(unsigned num_servants, record.servant_ = new T(); record.safe_servant_ = record.servant_; - CORBA::Object_var obj - = AppHelper::activate_servant(poa, + CORBA::Object_var obj + = AppHelper::activate_servant(poa, record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(record.obj_.in())) { @@ -98,10 +93,8 @@ ServantList<T>::deactivate(PortableServer::POA_ptr poa) { PortableServer::ObjectId_var id = poa->servant_to_id(record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object(id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_CATCHANY { @@ -114,7 +107,6 @@ ServantList<T>::deactivate(PortableServer::POA_ptr poa) "Caught unknown exception \n")); } ACE_ENDTRY; - ACE_CHECK; } #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp index f2a2e97b7a2..118fab9b70f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp @@ -23,7 +23,6 @@ int TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL) { int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Convert 1 to 0. Leave 0 and -1 as they are. return (rc == 1) ? 0 : rc; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h index 062b6fc0c8e..5003c93e296 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h @@ -27,7 +27,7 @@ main(int argc, char* argv[]) \ ACE_TRY_NEW_ENV \ { \ int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \ - ACE_TRY_CHECK; \ +\ return ret; \ } \ ACE_CATCHANY \ 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 bb0d1cf1bf7..68b29729797 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,8 +5,8 @@ #include "AppHelper.h" #include "ace/Log_Msg.h" -Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj, - unsigned client_id, +Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj, + unsigned client_id, bool collocated) : obj_(Foo_A::_duplicate(obj)), client_id_ (client_id), @@ -21,9 +21,9 @@ Foo_A_ClientEngine::~Foo_A_ClientEngine() bool -Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) +Foo_A_ClientEngine::execute(void) { - // Make sure the connection is established before making + // Make sure the connection is established before making // remote invocations. if (AppHelper::validate_connection (this->obj_.in ()) == false) { @@ -37,14 +37,11 @@ Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) CORBA::Long i = this->client_id_; - this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->op1(); this->obj_->op2(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (value != i) { @@ -54,15 +51,13 @@ Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) for (CORBA::Long j = 1; j <= 5; j++) { this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } bool caught_exception = false; ACE_TRY { - this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->obj_->op5(); } ACE_CATCH (FooException, ex) { @@ -70,14 +65,13 @@ Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) caught_exception = true; } ACE_ENDTRY; - + if (! caught_exception) { check_validity = false; } - this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->done(); return check_validity; } 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 4f49888f34f..ce83a52896c 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 @@ -26,7 +26,7 @@ class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); virtual ~Foo_A_ClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL); + virtual bool execute(void); static void expected_results(Foo_A_Statistics& stats); 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 a3bab7748aa..199d3b8755f 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 @@ -18,7 +18,7 @@ Foo_A_i::~Foo_A_i() void -Foo_A_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_A_i::op1(void) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[0] ++; @@ -26,7 +26,7 @@ Foo_A_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[1].push_back (value); @@ -35,7 +35,7 @@ Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) CORBA::Long -Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[2].push_back (value); @@ -45,7 +45,7 @@ Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); @@ -54,7 +54,7 @@ Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_A_i::op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_A_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; @@ -63,7 +63,7 @@ Foo_A_i::op5(ACE_ENV_SINGLE_ARG_DECL) void -Foo_A_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_A_i::done(void) ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); 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 6361baa6ca7..a43b1ffbc00 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 @@ -14,7 +14,7 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A Foo_A_i(); virtual ~Foo_A_i(); - virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -26,16 +26,16 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)); - virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void done(void) ACE_THROW_SPEC((CORBA::SystemException)); void gather_stats (Foo_A_Statistics& stats) ; private: - + LongVector in_values_ [5]; unsigned op_count_ [5]; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp index 8438b572ce2..d48f56fc505 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp @@ -12,8 +12,8 @@ Callback_i::~Callback_i () } -void -Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void +Callback_i::test_method(void) ACE_THROW_SPEC((CORBA::SystemException)) { this->num_callbacks_ ++; @@ -21,7 +21,7 @@ Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Callback_i::gather_stats(Foo_B_Statistics& stats) +Callback_i::gather_stats(Foo_B_Statistics& stats) { stats.actual_callbacks(this->num_callbacks_); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h index 8948435ceed..86afee9b4f7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h @@ -16,7 +16,7 @@ class CSD_TP_Foo_B_Export Callback_i virtual ~Callback_i(); - virtual void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void test_method(void) ACE_THROW_SPEC((CORBA::SystemException)); void gather_stats(Foo_B_Statistics& stats); 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 a928eb12169..1081dbec722 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 @@ -27,7 +27,7 @@ Foo_B_ClientEngine::~Foo_B_ClientEngine() bool -Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) +Foo_B_ClientEngine::execute(void) { // Make sure the connection is established before making // remote invocations. @@ -41,14 +41,11 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) // Verify the return values and return the results. bool check_validity = true; - this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->op1(); this->obj_->op2(this->client_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); CORBA::Long value = this->obj_->op3(this->client_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (value != static_cast<CORBA::Long>(this->client_id_)) { @@ -58,15 +55,13 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) for (CORBA::ULong j = 1; j <= 5; j++) { this->obj_->op4(495 + (this->client_id_ * 5) + j ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } bool caught_exception = false; ACE_TRY { - this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->obj_->op5(); } ACE_CATCH (FooException, ex) { @@ -94,7 +89,6 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) CORBA::String_var message = CORBA::string_dup(test_str); CORBA::Boolean result = this->obj_->op6( t, message.inout() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); ACE_UNUSED_ARG(result); @@ -108,16 +102,13 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) // Callback test. this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // One-Way calls with various arguments. CORBA::String_var ub_string = CORBA::string_dup( test_str ); this->obj_->test_unbounded_string_arg (ub_string.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); CORBA::String_var bd_string = CORBA::string_dup( test_str ); this->obj_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); Fixed_Array fixed_array; @@ -127,7 +118,6 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) } this->obj_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); Var_Array var_array; @@ -139,7 +129,6 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) } this->obj_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size(); @@ -147,7 +136,6 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) test_str); this->obj_->test_bounded_var_size_arg (bd_var_size_string.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100); ub_var_size_string->replace (ub_var_size_string->maximum (), @@ -155,25 +143,20 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) test_str); this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); this->obj_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); this->obj_->test_special_basic_arg (this->client_id_ % 2, this->client_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); this->obj_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // Sleep for 5 seconds before invoking done(). // This is a workaround with the problem that some oneway requests lost // when the server has multiple orb threads. ACE_OS::sleep (5); - this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->done(); return check_validity; } 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 a6e8e51667b..e0fb3995fdb 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 @@ -24,14 +24,14 @@ class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine { public: - Foo_B_ClientEngine(Foo_B_ptr obj, + Foo_B_ClientEngine(Foo_B_ptr obj, Callback_ptr callback, unsigned client_id = 0, bool collocated = false); virtual ~Foo_B_ClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL); + virtual bool execute(void); static void expected_results(Foo_B_Statistics& stats); static unsigned expected_callbacks (); 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 ec2d97c6bdf..01cf15a6596 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,7 +9,7 @@ extern const char* ONEWAY_ARG_TEST_STR; -Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, +Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, Callback_ptr callback, unsigned client_id, bool collocated) @@ -27,9 +27,9 @@ Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine() bool -Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) +Foo_B_SimpleClientEngine::execute(void) { - // Make sure the connection is established before making + // Make sure the connection is established before making // remote invocations. if (AppHelper::validate_connection (this->obj_.in ()) == false) { @@ -51,7 +51,6 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) } this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (FooException, ex) { @@ -62,8 +61,7 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; // Tell the servant that this client is done. - this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->done(); return check_validity; } 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 38ef6a09bcf..a1c3f535c33 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 @@ -24,14 +24,14 @@ class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine { public: - Foo_B_SimpleClientEngine(Foo_B_ptr obj, + Foo_B_SimpleClientEngine(Foo_B_ptr obj, Callback_ptr callback, unsigned client_id = 0, bool collocated = false); virtual ~Foo_B_SimpleClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL); + virtual bool execute(void); static void expected_results(Foo_B_Statistics& stats); static unsigned expected_callbacks (); 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 5ee8d0b8690..3c13ac41ea8 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 @@ -11,7 +11,7 @@ Foo_B_i::Foo_B_i() { for (unsigned i = 0; i < 16; i++) { - op_count_[i] = 0; + op_count_[i] = 0; } } @@ -22,7 +22,7 @@ Foo_B_i::~Foo_B_i() void -Foo_B_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_B_i::op1(void) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[0] ++; @@ -30,7 +30,7 @@ Foo_B_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[1] ++; @@ -39,7 +39,7 @@ Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) CORBA::Long -Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[2] ++; @@ -49,7 +49,7 @@ Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[3] ++; @@ -58,7 +58,7 @@ Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_B_i::op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_B_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; @@ -66,8 +66,8 @@ Foo_B_i::op5(ACE_ENV_SINGLE_ARG_DECL) } -CORBA::Boolean -Foo_B_i::op6(const TimeOfDay& t, +CORBA::Boolean +Foo_B_i::op6(const TimeOfDay& t, char*& message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -77,14 +77,14 @@ Foo_B_i::op6(const TimeOfDay& t, ACE_OS::sprintf (buf, "%s %d:%d:%d", message, t.hour, t.minute, t.second); CORBA::string_free (message); message = CORBA::string_dup (buf); - + return 1; } -void +void Foo_B_i::op7(Callback_ptr cb - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { @@ -99,39 +99,38 @@ Foo_B_i::op7(Callback_ptr cb } else { - cb->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + cb->test_method (); } } -void +void Foo_B_i::test_unbounded_string_arg(const char* message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[7] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ") - // ACE_TEXT("got unbounded string %s\n"), + // ACE_TEXT("got unbounded string %s\n"), // message)); this->in_string_[7].push_back (message); } -void +void Foo_B_i::test_bounded_string_arg(const char* message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[8] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ") - // ACE_TEXT("got bounded string %s\n"), + // ACE_TEXT("got bounded string %s\n"), // message)); this->in_string_[8].push_back (message); } -void +void Foo_B_i::test_fixed_array_arg(const Fixed_Array message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -141,7 +140,7 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message for (unsigned i = 0; i < 19; i++) { //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_fixed_array_arg ") - // ACE_TEXT("got fixed array[i] = %d\n"), + // ACE_TEXT("got fixed array[i] = %d\n"), // i, message[i])); if (message[i] != message[i + 1] -1) @@ -154,25 +153,25 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message } } - + this->in_long_[9].push_back (message[0]); } -void +void Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[10] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ") - // ACE_TEXT("got var array chars %s\n"), + // ACE_TEXT("got var array chars %s\n"), // message.get_buffer ())); this->in_string_[10].push_back (message.get_buffer ()); } -void +void Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -185,7 +184,7 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message } -void +void Foo_B_i::test_fixed_size_arg(const TimeOfDay& t ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -199,7 +198,7 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t } -void +void Foo_B_i::test_var_array_arg(const Var_Array messages ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -212,7 +211,7 @@ Foo_B_i::test_var_array_arg(const Var_Array messages //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") // ACE_TEXT(" %s \n"), messages[2].in ())); unsigned cur_client_id = 0; - + for (unsigned i = 0 ; i < 3; i ++) { unsigned client_id = 0; @@ -231,11 +230,11 @@ Foo_B_i::test_var_array_arg(const Var_Array messages { cur_client_id = client_id; } - else if (client_id != cur_client_id) + else if (client_id != cur_client_id) { error_count_ ++; ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg: client_id checking failed " - "- client_id=%u cur_client_id=%u error_count_=%u\n", + "- client_id=%u cur_client_id=%u error_count_=%u\n", client_id, cur_client_id, error_count_)); } } @@ -243,8 +242,8 @@ Foo_B_i::test_var_array_arg(const Var_Array messages } -void -Foo_B_i::test_special_basic_arg(CORBA::Boolean value, +void +Foo_B_i::test_special_basic_arg(CORBA::Boolean value, CORBA::Long client_id ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -264,7 +263,7 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value, } -void +void Foo_B_i::test_objref_arg(Callback_ptr cb ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -277,7 +276,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb void -Foo_B_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_B_i::done(void) ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); @@ -285,7 +284,7 @@ Foo_B_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Foo_B_i::gather_stats (Foo_B_Statistics& stats) +Foo_B_i::gather_stats (Foo_B_Statistics& stats) { for (unsigned i = 0; i < 16; i++) { 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 771eb05eca3..81ab536dbad 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 @@ -14,7 +14,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B Foo_B_i(); virtual ~Foo_B_i(); - virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -26,11 +26,11 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)); - virtual CORBA::Boolean op6(const TimeOfDay& t, - char*& message + virtual CORBA::Boolean op6(const TimeOfDay& t, + char*& message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); @@ -39,18 +39,18 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B ACE_THROW_SPEC((CORBA::SystemException, FooException)); - virtual void test_unbounded_string_arg(const char* message + virtual void test_unbounded_string_arg(const char* message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - + virtual void test_bounded_string_arg(const char* message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - + virtual void test_fixed_array_arg(const Fixed_Array message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - + virtual void test_var_array_arg(const Var_Array messages ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); @@ -58,7 +58,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - + virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); @@ -76,13 +76,13 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void done(void) ACE_THROW_SPEC((CORBA::SystemException)); - void gather_stats (Foo_B_Statistics& stats); + void gather_stats (Foo_B_Statistics& stats); private: - + LongVector in_long_ [16]; StringVector in_string_ [16]; unsigned op_count_ [16]; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp index fdd8b4e2671..219e27956c3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp @@ -18,12 +18,12 @@ Foo_C_ClientEngine::~Foo_C_ClientEngine() bool -Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) -{ +Foo_C_ClientEngine::execute(void) +{ // Verify the return values and return the results. bool check_validity = true; - // Make sure the connection is established before making + // Make sure the connection is established before making // remote invocations. if (AppHelper::validate_connection (this->obj_.in ()) == false) { @@ -34,14 +34,11 @@ Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) CORBA::Long i = this->client_id_; - this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->op1(); this->obj_->op2(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (value != i) { @@ -51,15 +48,13 @@ Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) for (CORBA::Long j = 1; j <= 5; j++) { this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } bool caught_exception = false; - + ACE_TRY { - this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->obj_->op5(); } ACE_CATCH (FooException, ex) { @@ -73,8 +68,7 @@ Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) check_validity = false; } - this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->obj_->done(); return check_validity; } @@ -84,7 +78,7 @@ void Foo_C_ClientEngine::expected_results(Foo_C_Statistics& stats) { // This ClientEngine is used by remote clients. - stats.expected(1, 1, true); + stats.expected(1, 1, true); stats.expected(2, 1, true); stats.expected(3, 1, true); stats.expected(4, 5, true); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h index 54247223f04..493edfc853d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h @@ -27,7 +27,7 @@ class CSD_TP_Foo_C_Export Foo_C_ClientEngine : public ClientEngine unsigned client_id); virtual ~Foo_C_ClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL); + virtual bool execute(void); static void expected_results(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp index da6b44f7c71..a5761265950 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp @@ -21,9 +21,9 @@ Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine() bool -Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_ClientEngine::execute(void) { - // Make sure the connection is established before making + // Make sure the connection is established before making // remote invocations. if (this->proxy_.validate_connection () == false) { @@ -35,12 +35,9 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) bool check_validity = true; CORBA::Long i = this->client_id_; - this->proxy_.op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->proxy_.op1(); this->proxy_.op2(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); CORBA::Long value = this->proxy_.op3(i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (value != i) { @@ -51,13 +48,12 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) for (CORBA::Long j = 1; j <= 5; j++) { this->proxy_.op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } bool caught_exception = false; ACE_TRY_EX (op5) { - this->proxy_.op5(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_.op5(); ACE_TRY_CHECK_EX (op5); } ACE_CATCH (FooException, ex) @@ -74,12 +70,9 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) long cust_i = this->client_id_; - this->proxy_.cust_op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + this->proxy_.cust_op1(); this->proxy_.cust_op2(cust_i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); long cust_value = this->proxy_.cust_op3(cust_i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (cust_value != i) { @@ -89,14 +82,13 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) for (long cust_j = 1; cust_j <= 5; cust_j++) { this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } caught_exception = false; ACE_TRY_EX (cust_op5) { - this->proxy_.cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_.cust_op5(); ACE_TRY_CHECK_EX (cust_op5) } ACE_CATCHANY //(CustomException, ex) @@ -111,9 +103,8 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL) check_validity = false; } - this->proxy_.done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - + this->proxy_.done(); + return check_validity; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h index 9d51fcddcea..ae66ab13afe 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h @@ -28,7 +28,7 @@ class CSD_TP_Foo_C_Export Foo_C_Custom_ClientEngine : public ClientEngine unsigned client_id); virtual ~Foo_C_Custom_ClientEngine(); - virtual bool execute(ACE_ENV_SINGLE_ARG_DECL); + virtual bool execute(void); static void expected_results(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp index 0fc2e22471a..d59859dabcc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp @@ -15,13 +15,12 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant, objref_(Foo_C::_duplicate(objref)), strategy_(strategy, false) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -32,13 +31,12 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant, Foo_C_Custom_Proxy::~Foo_C_Custom_Proxy() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -55,10 +53,9 @@ Foo_C_Custom_Proxy::validate_connection () void -Foo_C_Custom_Proxy::op1(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_Proxy::op1(void) { - this->objref_->op1(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->objref_->op1(); } @@ -66,7 +63,6 @@ void Foo_C_Custom_Proxy::op2(CORBA::Long x ACE_ENV_ARG_DECL) { this->objref_->op2(x ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -74,7 +70,6 @@ CORBA::Long Foo_C_Custom_Proxy::op3(CORBA::Long x ACE_ENV_ARG_DECL) { CORBA::Long result = this->objref_->op3(x ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return result; } @@ -83,32 +78,28 @@ void Foo_C_Custom_Proxy::op4(CORBA::Long x ACE_ENV_ARG_DECL) { this->objref_->op4(x ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Foo_C_Custom_Proxy::op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_Proxy::op5(void) { - this->objref_->op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->objref_->op5(); } void -Foo_C_Custom_Proxy::done(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_Proxy::done(void) { - this->objref_->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->objref_->done(); } void -Foo_C_Custom_Proxy::cust_op1(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_Proxy::cust_op1(void) { Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_); this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -117,7 +108,6 @@ Foo_C_Custom_Proxy::cust_op2(long x ACE_ENV_ARG_DECL) { Foo_C_cust_op2_Handle op = new Foo_C_cust_op2(this->servant_, x); this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -126,9 +116,7 @@ Foo_C_Custom_Proxy::cust_op3(long x ACE_ENV_ARG_DECL) { Foo_C_cust_op3_Handle op = new Foo_C_cust_op3(this->servant_, x); this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - int ret = op->result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + int ret = op->result(); return ret; } @@ -138,16 +126,13 @@ Foo_C_Custom_Proxy::cust_op4(long x ACE_ENV_ARG_DECL) { Foo_C_cust_op4_Handle op = new Foo_C_cust_op4(this->servant_,x); this->strategy_->custom_asynch_request(op.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Foo_C_Custom_Proxy::cust_op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_Custom_Proxy::cust_op5(void) { Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_); this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - op->result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + op->result(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h index 5cd7eeae55a..95e08b34758 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h @@ -30,18 +30,18 @@ public: bool validate_connection (); - void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void op1(void); void op2(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Long op3(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); void op4(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void op5(void); + void done(void); - void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void cust_op1(void); void cust_op2(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); long cust_op3(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); void cust_op4(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void cust_op5(void); private: Foo_C_i* servant_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp index 3ca92e4af2e..feaf7ea73ca 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp @@ -9,13 +9,12 @@ Foo_C_cust_op1::Foo_C_cust_op1(Foo_C_i* servant) cancelled_(false), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -26,13 +25,12 @@ Foo_C_cust_op1::Foo_C_cust_op1(Foo_C_i* servant) Foo_C_cust_op1::~Foo_C_cust_op1() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -42,7 +40,7 @@ Foo_C_cust_op1::~Foo_C_cust_op1() void -Foo_C_cust_op1::result(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_cust_op1::result(void) { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h index 553cb27a6d8..b00b7d26290 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h @@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op1 : public TAO::CSD::TP_Custom_Request_Op Foo_C_cust_op1(Foo_C_i* servant); virtual ~Foo_C_cust_op1(); - void result(ACE_ENV_SINGLE_ARG_DECL); + void result(void); protected: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp index c0bc62fb2f0..854bfafbb1c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp @@ -10,13 +10,12 @@ Foo_C_cust_op2::Foo_C_cust_op2(Foo_C_i* servant, long arg) cancelled_(false), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -27,13 +26,12 @@ Foo_C_cust_op2::Foo_C_cust_op2(Foo_C_i* servant, long arg) Foo_C_cust_op2::~Foo_C_cust_op2() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -43,7 +41,7 @@ Foo_C_cust_op2::~Foo_C_cust_op2() void -Foo_C_cust_op2::result(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_cust_op2::result(void) { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h index 8a319e3b50a..9e5cc914ca7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h @@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op2 : public TAO::CSD::TP_Custom_Request_Op Foo_C_cust_op2(Foo_C_i* servant, long arg); virtual ~Foo_C_cust_op2(); - void result(ACE_ENV_SINGLE_ARG_DECL); + void result(void); protected: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp index b6bfad9dc67..ab73409239f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp @@ -11,13 +11,12 @@ Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg) cancelled_(false), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -28,13 +27,12 @@ Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg) Foo_C_cust_op3::~Foo_C_cust_op3() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -44,7 +42,7 @@ Foo_C_cust_op3::~Foo_C_cust_op3() long -Foo_C_cust_op3::result(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_cust_op3::result(void) { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h index 7e86e3c8a53..2f48440f835 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h @@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op3 : public TAO::CSD::TP_Custom_Request_Op Foo_C_cust_op3(Foo_C_i* servant, long arg); virtual ~Foo_C_cust_op3(); - long result(ACE_ENV_SINGLE_ARG_DECL); + long result(void); protected: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp index 828e841990f..80a7e0ecf3e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp @@ -8,13 +8,12 @@ Foo_C_cust_op4::Foo_C_cust_op4(Foo_C_i* servant, long arg) arg_(arg), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -24,13 +23,12 @@ Foo_C_cust_op4::Foo_C_cust_op4(Foo_C_i* servant, long arg) Foo_C_cust_op4::~Foo_C_cust_op4() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp index 6f5b6756dda..02bd2c69714 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp @@ -11,13 +11,12 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant) cancelled_(false), servant_(servant) { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_add_ref (); } ACE_CATCHALL { @@ -28,13 +27,12 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant) Foo_C_cust_op5::~Foo_C_cust_op5() { - // This try-catch block is not really necessary, but we have to add it to - // satisfy the non-exception builds. Since there is actually no exception + // This try-catch block is not really necessary, but we have to add it to + // satisfy the non-exception builds. Since there is actually no exception // raised from _add_ref, we just ignore the exception here. ACE_TRY_NEW_ENV { - servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant_->_remove_ref (); } ACE_CATCHALL { @@ -44,7 +42,7 @@ Foo_C_cust_op5::~Foo_C_cust_op5() void -Foo_C_cust_op5::result(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_cust_op5::result(void) { if (this->cancelled_) { @@ -63,8 +61,7 @@ Foo_C_cust_op5::execute_i() { ACE_TRY_NEW_ENV { - this->servant_->cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servant_->cust_op5(); } ACE_CATCH (CustomException, ex) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h index d6963d31bbe..7c3e239daf2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h @@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op5 : public TAO::CSD::TP_Custom_Request_Op Foo_C_cust_op5(Foo_C_i* servant); virtual ~Foo_C_cust_op5(); - void result(ACE_ENV_SINGLE_ARG_DECL); + void result(void); protected: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp index 25fadd9deef..69c468daaf2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp @@ -19,7 +19,7 @@ Foo_C_i::~Foo_C_i() void -Foo_C_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_C_i::op1(void) ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_[0]; @@ -27,7 +27,7 @@ Foo_C_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[1].push_back (value); @@ -36,7 +36,7 @@ Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) CORBA::Long -Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[2].push_back (value); @@ -46,7 +46,7 @@ Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); @@ -55,7 +55,7 @@ Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_C_i::op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ++this->count_[4]; @@ -64,7 +64,7 @@ Foo_C_i::op5(ACE_ENV_SINGLE_ARG_DECL) void -Foo_C_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_C_i::done(void) ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); @@ -72,7 +72,7 @@ Foo_C_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Foo_C_i::cust_op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Foo_C_i::cust_op1(void) { ++this->count_[5]; } @@ -104,7 +104,7 @@ Foo_C_i::cust_op4(long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_C_i::cust_op5(ACE_ENV_SINGLE_ARG_DECL) +Foo_C_i::cust_op5(void) { ++this->count_[9]; ACE_THROW (CustomException()); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h index c58cfb288d4..012a6a47bb3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h @@ -14,7 +14,7 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C Foo_C_i(); virtual ~Foo_C_i(); - virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -26,18 +26,18 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)); - virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void done(void) ACE_THROW_SPEC((CORBA::SystemException)); - void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void cust_op1(void); void cust_op2(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS); long cust_op3(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS); void cust_op4(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void cust_op5(void); void gather_stats(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp index d51dfbda1b1..e58e46b0e80 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp @@ -23,7 +23,6 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB before parsing our own args. CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -38,14 +37,12 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the appropriate client "engine" object. Foo_A_ClientEngine engine(foo.in()); // Execute the client algorithm - result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1; - ACE_CHECK_RETURN (-1); + result = engine.execute() ? 0 : -1; return result; } 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 eb0d108bfb1..a6a1208b0bd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp @@ -28,7 +28,6 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB before parsing our own args. CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -41,19 +40,16 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) } TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the Root POA PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -66,14 +62,13 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the thread pool servant dispatching strategy object, and // hold it in a (local) smart pointer variable. TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_strategy = new TAO::CSD::TP_Strategy(); - + // Tell the strategy to apply itself to the child poa. if (csd_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false) { @@ -81,7 +76,6 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) "Failed to apply CSD strategy to child poa.\n")); return -1; } - ACE_CHECK_RETURN (-1); // Create the servant object. Foo_A_i* servant = new Foo_A_i(); @@ -94,25 +88,21 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(), servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Stringify and save the object reference to a file AppHelper::ref_to_file(orb.in(), obj.in(), this->ior_filename_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Activate the POA Manager - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is ready. Running the ORB event loop.\n")); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + orb->run (); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp ORB event loop has completed.\n")); @@ -129,13 +119,11 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) "(%P|%t) ServerApp is destroying the Root POA.\n")); root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the ORB.\n")); - orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + orb->destroy(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp has completed running successfully.\n")); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp index 531dba15f17..fb1f32e6fe2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp @@ -24,17 +24,14 @@ int ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (result != 0) { return result; } - this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->client_setup(); - result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + result = this->run_engine(); this->cleanup(); return result; } @@ -44,7 +41,6 @@ int ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -55,13 +51,12 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) void -ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::client_setup(void) { // Turn the ior_ into a Foo_A obj ref. Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create the ClientEngine object, and give it the Foo_A obj ref. this->engine_ = new Foo_A_ClientEngine(foo.in(), this->client_id_); @@ -69,10 +64,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) int -ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::run_engine(void) { - bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + bool result = this->engine_->execute(); return result ? 0 : -1; } @@ -107,7 +101,7 @@ ClientApp::parse_args(int argc, char* argv[]) c, "client_kind"); break; - + case 'n': result = set_arg(this->client_id_, get_opts.opt_arg(), diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h index d5bb80cf800..6b359e96eb3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h @@ -23,8 +23,8 @@ class ClientApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void client_setup(ACE_ENV_SINGLE_ARG_DECL); - int run_engine(ACE_ENV_SINGLE_ARG_DECL); + void client_setup(void); + int run_engine(void); void cleanup(); // Helper methods used by the methods above. 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 f291baacad4..89ab455005c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp @@ -33,32 +33,25 @@ int ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (result != 0) { return result; } - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->servant_setup(); this->collocated_setup(); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_activate(); + this->run_collocated_clients(); + this->run_orb_event_loop(); // Calling wait on ACE_Thread_Manager singleton to avoid the problem // that the main thread might exit before all CSD Threads exit. // Wait for all CSD task threads exit. ACE_Thread_Manager::instance ()->wait (); - + this->cleanup(); return this->check_validity () ? 0 : -1; } @@ -68,41 +61,38 @@ int ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. // * Returns 1 if the usage statement was explicitly requested. // * Returns 0 otherwise. int result = this->parse_args(argc, argv); - + if (result != 0) { return result; } - + unsigned num_clients = this->num_remote_clients_ + this->num_collocated_clients_; TheAppShutdown->init (this->orb_.in (), num_clients ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_setup(void) { - this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" + this->poa_ = this->create_poa(this->orb_.in(), + "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -112,19 +102,17 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; } void -ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::servant_setup(void) { this->servants_.create_and_activate(this->num_servants_, this->orb_.in (), this->poa_.in (), this->ior_filename_prefix_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -145,19 +133,17 @@ ServerApp::collocated_setup() void -ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_activate(void) { - PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POAManager_var poa_manager + = this->poa_->the_POAManager(); - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate(); } void -ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_collocated_clients(void) { if (this->num_collocated_clients_ > 0) { @@ -170,11 +156,10 @@ ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } @@ -287,7 +272,7 @@ ServerApp::usage_statement() int ServerApp::arg_dependency_checks() { - return (this->num_remote_clients_ + return (this->num_remote_clients_ + this->num_collocated_clients_) > 0 ? 0 : -1; } @@ -316,21 +301,19 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr -ServerApp::create_poa(CORBA::ORB_ptr orb, +ServerApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL) { // Get the Root POA. PortableServer::POA_var root_poa - = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, + = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. - PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + PortableServer::POAManager_var poa_manager + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -342,7 +325,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); @@ -353,7 +335,7 @@ bool ServerApp::check_validity () { // Check whether the clients return any errors. - if (this->num_collocated_clients_ > 0 + if (this->num_collocated_clients_ > 0 && this->collocated_client_task_.failure_count () > 0) { return false; @@ -363,7 +345,7 @@ ServerApp::check_validity () this->num_collocated_clients_; Foo_A_Statistics stats (num_clients); - + Foo_A_ClientEngine::expected_results (stats); for (unsigned i = 0; i < this->num_servants_; i++) 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 73b5ccbbd94..91153fb1ffb 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h @@ -27,13 +27,13 @@ class ServerApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void servant_setup(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void servant_setup(void); void collocated_setup(); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); - void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void poa_activate(void); + void run_collocated_clients(void); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp index 147b5ca43cf..c07d9defed6 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp @@ -32,23 +32,17 @@ int ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - if (result != 0) + if (result != 0) { return result; } - ACE_CHECK_RETURN (-1); - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->client_setup(); + this->poa_activate(); this->run_clients(); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->run_orb_event_loop(); // Calling wait on ACE_Thread_Manager singleton to avoid the problem // that the main thread might exit before all CSD Threads exit. @@ -67,7 +61,6 @@ int ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -80,24 +73,22 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) } TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::poa_setup(void) { - this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" + this->poa_ = this->create_poa(this->orb_.in(), + "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -107,41 +98,36 @@ ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; } void -ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::client_setup(void) { // Turn the ior_ into a Foo_B obj ref. Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + this->servants_.create_and_activate(1, // number of callback servants this->poa_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ServantListType::T_stub_var cb = this->servants_.objref(0); - // Create the ClientEngine object, and give it the Foo_B and Callback object + // Create the ClientEngine object, and give it the Foo_B and Callback object // references. - ClientEngine_Handle engine + ClientEngine_Handle engine = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_); this->client_task_.add_engine(engine.in()); } void -ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::poa_activate(void) { - PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POAManager_var poa_manager + = this->poa_->the_POAManager(); + poa_manager->activate(); } @@ -153,31 +139,28 @@ ClientApp::run_clients() void -ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } PortableServer::POA_ptr -ClientApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name +ClientApp::create_poa(CORBA::ORB_ptr orb, + const char* poa_name ACE_ENV_ARG_DECL) { // Get the Root POA. PortableServer::POA_var root_poa - = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, + = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. - PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + PortableServer::POAManager_var poa_manager + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -189,7 +172,6 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h index 2eb6f23bd39..417447aee99 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h @@ -28,12 +28,12 @@ class ClientApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void client_setup(ACE_ENV_SINGLE_ARG_DECL); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void client_setup(void); + void poa_activate(void); void run_clients(); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); 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 883a0dec322..e00db2de579 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp @@ -35,30 +35,22 @@ int ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - if (result != 0) + if (result != 0) { return result; } - ACE_CHECK_RETURN (-1); - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->servant_setup(); + this->collocated_setup(); + this->poa_activate(); + this->run_collocated_clients(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is ready. Running the ORB event loop.\n")); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->run_orb_event_loop(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp ORB event loop has completed.\n")); @@ -83,7 +75,6 @@ int ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -99,31 +90,28 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) this->num_collocated_clients_; TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_setup(void) { - this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" + this->poa_ = this->create_poa(this->orb_.in(), + "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + if (this->num_collocated_clients_ > 0) { - this->cb_poa_ = this->create_poa(this->orb_.in(), - "CallbackPoa" + this->cb_poa_ = this->create_poa(this->orb_.in(), + "CallbackPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -133,10 +121,9 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; // Use another poa and strategy for callbacks. This would resolve - // the deadlock situation that happens when having number of csd + // the deadlock situation that happens when having number of csd // threads less than number of collocated clients. if (this->num_collocated_clients_ > 0) { @@ -146,26 +133,24 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to callback poa.\n")); ACE_THROW(TestAppException()); - } - ACE_CHECK; + } } } void -ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::servant_setup(void) { this->foo_servants_.create_and_activate(this->num_servants_, this->orb_.in (), this->poa_.in (), this->ior_filename_prefix_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::collocated_setup(void) { if (this->num_collocated_clients_ == 0) return; @@ -173,10 +158,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) this->cb_servants_.create_and_activate(1, // number of callback servants this->cb_poa_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0); - + unsigned client_id = this->num_remote_clients_; for (unsigned i = 0; i < this->num_collocated_clients_; i++) @@ -185,9 +169,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) // Dole out the servant object references in a round-robin fashion. unsigned servant_index = i % this->num_servants_; - FooServantListType::T_stub_var foo + FooServantListType::T_stub_var foo = this->foo_servants_.objref(servant_index); - ClientEngine_Handle engine + ClientEngine_Handle engine = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id, true); this->collocated_client_task_.add_engine(engine.in()); } @@ -195,18 +179,16 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_activate(void) { - PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POAManager_var poa_manager + = this->poa_->the_POAManager(); + poa_manager->activate(); } void -ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_collocated_clients(void) { if (this->num_collocated_clients_ > 0) { @@ -219,11 +201,10 @@ ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } @@ -336,7 +317,7 @@ ServerApp::usage_statement() int ServerApp::arg_dependency_checks() { - return (this->num_remote_clients_ + return (this->num_remote_clients_ + this->num_collocated_clients_) > 0 ? 0 : -1; } @@ -365,21 +346,19 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr -ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name +ServerApp::create_poa(CORBA::ORB_ptr orb, + const char* poa_name ACE_ENV_ARG_DECL) { // Get the Root POA. PortableServer::POA_var root_poa - = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" + = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, + "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. - PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + PortableServer::POAManager_var poa_manager + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -391,7 +370,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); @@ -402,7 +380,7 @@ bool ServerApp::check_validity () { // Check whether the clients return any errors. - if (this->num_collocated_clients_ > 0 + if (this->num_collocated_clients_ > 0 && this->collocated_client_task_.failure_count () > 0) { return false; @@ -410,7 +388,7 @@ ServerApp::check_validity () Foo_B_Statistics stats (this->num_remote_clients_, this->num_collocated_clients_); - + Foo_B_ClientEngine::expected_results (stats); for (unsigned i = 0; i < this->num_servants_; i++) 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 12af1ec455b..20216f8fd52 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h @@ -28,13 +28,13 @@ class ServerApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void servant_setup(ACE_ENV_SINGLE_ARG_DECL); - void collocated_setup(ACE_ENV_SINGLE_ARG_DECL); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); - void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void servant_setup(void); + void collocated_setup(void); + void poa_activate(void); + void run_collocated_clients(void); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp index 57520df303c..512c34c50f2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp @@ -24,17 +24,14 @@ int ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); - if (result != 0) + if (result != 0) { return result; } - ACE_CHECK_RETURN (-1); - this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->client_setup(); - result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + result = this->run_engine(); this->cleanup(); @@ -46,7 +43,6 @@ int ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -57,13 +53,12 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) void -ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::client_setup(void) { // Turn the ior_ into a Foo_C obj ref. Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create the ClientEngine object, and give it the Foo_C obj ref. this->engine_ = new Foo_C_ClientEngine(foo.in(), this->client_id_); @@ -71,10 +66,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL) int -ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL) +ClientApp::run_engine(void) { - bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + bool result = this->engine_->execute(); return result ? 0 : -1; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h index e2f7bf6fc06..2dbf7dd6d52 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h @@ -24,8 +24,8 @@ class ClientApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void client_setup(ACE_ENV_SINGLE_ARG_DECL); - int run_engine(ACE_ENV_SINGLE_ARG_DECL); + void client_setup(void); + int run_engine(void); void cleanup(); // Helper methods used by the methods above. 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 9ce517c4863..2841377eb6e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp @@ -39,21 +39,14 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { return result; } - ACE_CHECK_RETURN (-1); - - this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + + this->poa_setup(); + this->csd_setup(); + this->servant_setup(); this->collocated_setup(); - this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_activate(); + this->run_collocated_clients(); + this->run_orb_event_loop(); // Calling wait on ACE_Thread_Manager singleton to avoid the problem // that the main thread might exit before all CSD Threads exit. @@ -70,7 +63,6 @@ int ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -86,24 +78,22 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) this->num_collocated_clients_; TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -113,19 +103,17 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL) "Failed to apply CSD strategy to poa.\n")); ACE_THROW(TestAppException()); } - ACE_CHECK; } void -ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::servant_setup(void) { this->servants_.create_and_activate(this->num_servants_, this->orb_.in (), this->poa_.in (), this->ior_filename_prefix_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -157,19 +145,17 @@ ServerApp::collocated_setup() void -ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::poa_activate(void) { PortableServer::POAManager_var poa_manager - = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + = this->poa_->the_POAManager(); - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate(); } void -ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_collocated_clients(void) { if (this->num_collocated_clients_ > 0) { @@ -182,11 +168,10 @@ ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL) void -ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL) +ServerApp::run_orb_event_loop(void) { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); - orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_runner.run(); TheAppShutdown->wait (); } @@ -348,12 +333,10 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -366,7 +349,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); 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 99f0af758b5..f39e160df29 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h @@ -27,13 +27,13 @@ class ServerApp : public TestAppBase // These are all called, in order, by the run_i() method. int init(int argc, char* argv[] ACE_ENV_ARG_DECL); - void poa_setup(ACE_ENV_SINGLE_ARG_DECL); - void csd_setup(ACE_ENV_SINGLE_ARG_DECL); - void servant_setup(ACE_ENV_SINGLE_ARG_DECL); + void poa_setup(void); + void csd_setup(void); + void servant_setup(void); void collocated_setup(); - void poa_activate(ACE_ENV_SINGLE_ARG_DECL); - void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL); - void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL); + void poa_activate(void); + void run_collocated_clients(void); + void run_orb_event_loop(void); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp index f85722246b5..e4569d3dcce 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -62,17 +59,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp index bd2b023e2b7..3b118c15dc3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -73,12 +69,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,19 +84,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); // Wait for all CSD task threads exit. ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp index 38dd8c26647..433a19eb187 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp @@ -26,7 +26,6 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB before parsing our own args. CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -41,14 +40,12 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(), this->ior_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the appropriate client "engine" object. Foo_A_ClientEngine engine(foo.in()); // Execute the client algorithm - result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1; - ACE_CHECK_RETURN (-1); + result = engine.execute() ? 0 : -1; return result; } 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 c4af3802881..c4ceffd9f79 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp @@ -26,7 +26,6 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB before parsing our own args. CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -39,19 +38,16 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) } TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the Root POA PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + = root_poa->the_POAManager(); // Create the child POA Policies. CORBA::PolicyList policies(0); @@ -64,7 +60,6 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) poa_manager.in(), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the servant object. Foo_A_i* servant = new Foo_A_i(); @@ -77,25 +72,21 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(), servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Stringify and save the object reference to a file AppHelper::ref_to_file(orb.in(), obj.in(), this->ior_filename_.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Activate the POA Manager - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is ready. Running the ORB event loop.\n")); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + orb->run (); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp ORB event loop has completed.\n")); @@ -112,13 +103,11 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) "(%P|%t) ServerApp is destroying the Root POA.\n")); root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the ORB.\n")); - orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + orb->destroy(); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp has completed running successfully.\n")); diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index 8d28b7d9bc5..55edd4c9318 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -14,7 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) @@ -27,7 +27,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index 167a3e08b27..17b342d7946 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/client.cpp @@ -46,18 +46,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -68,20 +65,17 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); if (do_shutdown) { - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index ef867fc77aa..98847fd73ea 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp index 7b310b57b2f..833974f7588 100644 --- a/TAO/tests/CallbackTest/Callback.cpp +++ b/TAO/tests/CallbackTest/Callback.cpp @@ -23,7 +23,7 @@ Callback::are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_NOT_USED) } void -Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Callback::test_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Callback::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h index 81f26ac880a..d98dc9313d3 100644 --- a/TAO/tests/CallbackTest/Callback.h +++ b/TAO/tests/CallbackTest/Callback.h @@ -20,10 +20,10 @@ public: virtual CORBA::Boolean are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void test_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp index 9eca34c0d58..afc8568114d 100644 --- a/TAO/tests/CallbackTest/Service.cpp +++ b/TAO/tests/CallbackTest/Service.cpp @@ -28,11 +28,9 @@ Service::run_test (Test::Callback_ptr callback { int exceptions = this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK; exceptions += this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (exceptions != 0) { @@ -45,8 +43,7 @@ Service::run_test (Test::Callback_ptr callback ACE_TRY { - callback->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback->shutdown (); } ACE_CATCHANY { @@ -75,7 +72,6 @@ Service::call_are_you_there (Test::Callback_ptr callback ACE_TRY { (void) callback->are_you_there (out_str ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -101,8 +97,7 @@ Service::call_test_oneway (Test::Callback_ptr callback { ACE_TRY { - (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) callback->test_oneway (); } ACE_CATCHANY { diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index c83089e148d..de331840625 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -42,15 +42,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,19 +55,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,15 +77,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); } if (parse_args (argc, argv) != 0) @@ -99,11 +90,9 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Service_var service = Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (service.in ())) { @@ -120,29 +109,23 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); Test::Callback_var callback = - callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting test\n")); service->run_test (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - running ORB\n")); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index 07c1e010f40..278bb19fecc 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,19 +56,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,15 +78,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); } if (parse_args (argc, argv) != 0) @@ -105,12 +96,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(service_impl); Test::Service_var service = - service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + service_impl->_this (); CORBA::String_var ior = orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -122,21 +111,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); service_impl->dump_results (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index 2ae166c58be..b96db57fb72 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -30,13 +30,11 @@ Client_Task::svc (void) ACE_TRY { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); for (int i = 0; i != this->iterations_; ++i) { - int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + int retval = this->one_iteration (); if (retval != 0) successful_calls++; @@ -65,14 +63,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (void) { ACE_TRY { for (int i = 0; i != 100; ++i) { - (void) this->process_factory_->noop (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) this->process_factory_->noop (); } } ACE_CATCH (CORBA::TRANSIENT, ex) @@ -80,23 +77,19 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) // Ignore transient exceptions } ACE_ENDTRY; - ACE_CHECK; } int -Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::one_iteration (void) { ACE_TRY { Test::Process_var process = - this->process_factory_->create_new_process (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->process_factory_->create_new_process (); - (void) process->get_process_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) process->get_process_id (); - process->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + process->shutdown (); return 1; } diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h index 573697926b1..b6df65e973e 100644 --- a/TAO/tests/Client_Leaks/Client_Task.h +++ b/TAO/tests/Client_Leaks/Client_Task.h @@ -29,10 +29,10 @@ public: private: /// Run one iteration of the test - int one_iteration (ACE_ENV_SINGLE_ARG_DECL); + int one_iteration (void); /// Make sure that the thread has a connection available - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); + void validate_connection (void); private: /// Reference to the test interface diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index 54a6acd58f3..9b40b7287b9 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -12,16 +12,15 @@ Process::Process (CORBA::ORB_ptr orb) } CORBA::Long -Process::get_process_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Process::get_process_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return ACE_OS::getpid (); } void -Process::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Process::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index 4118fc33d58..66e56de62de 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -17,10 +17,10 @@ public: Process (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long get_process_id (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_process_id (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index f1039150d26..7e474c5fb29 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -20,24 +20,21 @@ Process_Factory::shutdown_received (void) } Test::Process_ptr -Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) +Process_Factory::create_new_process (void) ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)) { Startup_Callback *startup_callback_impl; ACE_NEW_THROW_EX (startup_callback_impl, Startup_Callback, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Process::_nil ()); PortableServer::ServantBase_var owner_transfer(startup_callback_impl); Test::Startup_Callback_var startup_callback = - startup_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (Test::Process::_nil ()); + startup_callback_impl->_this (); CORBA::String_var ior = this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Test::Process::_nil ()); const char* argv[3] = { "child", @@ -69,7 +66,6 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) { ACE_Time_Value interval (0, 10000); this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Test::Process::_nil ()); process_has_started = startup_callback_impl->process_has_started (the_process.out ()); @@ -78,13 +74,10 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { PortableServer::POA_var poa = - startup_callback_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + startup_callback_impl->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -104,13 +97,13 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) } void -Process_Factory::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Process_Factory::noop (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Process_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Process_Factory::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown_received_ = 1; diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index 0836a583d84..2aee99b70cf 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -20,13 +20,13 @@ public: int shutdown_received (void); // = The skeleton methods - virtual Test::Process_ptr create_new_process (ACE_ENV_SINGLE_ARG_DECL) + virtual Test::Process_ptr create_new_process (void) ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)); - virtual void noop (ACE_ENV_SINGLE_ARG_DECL) + virtual void noop (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp index 150de719f94..5fc1eaba932 100644 --- a/TAO/tests/Client_Leaks/Server_Task.cpp +++ b/TAO/tests/Client_Leaks/Server_Task.cpp @@ -23,7 +23,6 @@ Server_Task::svc (void) // run the test for at most 120 seconds... // ACE_Time_Value tv (120, 0); this->orb_->run ( /* tv, */ ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index 4ee5c104d0b..1306fce8821 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -12,14 +12,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (argc < 2) { // Paranoia, we should have an auto_ptr-like gadget for // this. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s <ior>\n", @@ -28,10 +26,8 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Startup_Callback_var startup_callback = Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (startup_callback.in ())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -41,11 +37,9 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,8 +47,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Process *process_impl; ACE_NEW_RETURN (process_impl, @@ -63,24 +56,18 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(process_impl); Test::Process_var process = - process_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + process_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value tv (50, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp index a06c49b3e8a..dd2188d33ff 100644 --- a/TAO/tests/Client_Leaks/client.cpp +++ b/TAO/tests/Client_Leaks/client.cpp @@ -52,18 +52,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Process_Factory_var process_factory = Test::Process_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (process_factory.in ())) { @@ -83,11 +80,9 @@ main (int argc, char *argv[]) } ACE_Thread_Manager::instance ()->wait (); - process_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + process_factory->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); // Only pass the test if 90% of the calls worked if (client_task.successful_calls () < 0.9 * iterations * threads) diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 4260fbfd963..e2cdeaa4672 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -40,15 +40,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +53,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(process_factory_impl); Test::Process_Factory_var process = - process_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + process_factory_impl->_this (); CORBA::String_var ior = orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,8 +80,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (orb.in (), ACE_Thread_Manager::instance ()); @@ -102,10 +95,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index bc016b1755d..7f5067981a7 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -62,7 +62,6 @@ int main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get IOR from command line (or file) if (argc != 2) @@ -78,12 +77,10 @@ int main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (buf ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the server simple_var server = simple::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *bare_string = "Hello World"; @@ -98,7 +95,6 @@ int main (int argc, char *argv[]) inarg, outarg.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *any_reply; outarg >>= any_reply; diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 1f8cb2c10c2..ce8d9809acf 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -66,7 +66,7 @@ public: return CORBA::wstring_dup (s1); }; - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -91,13 +91,11 @@ int main(int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize POA CORBA::Object_var poa_object= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check POA if (CORBA::is_nil (poa_object.in ())) @@ -111,12 +109,10 @@ int main(int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA manager PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Create a C++ implementation of CORBA object SimpleImpl* my_impl = 0; @@ -125,13 +121,11 @@ int main(int argc, char *argv[]) -1); // Create CORBA object for servant and REGISTER with POA - simple_var server = my_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_var server = my_impl->_this (); // Get the IOR for our object CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen ("server.ior", "w"); if (output_file == 0) @@ -143,18 +137,14 @@ int main(int argc, char *argv[]) ACE_OS::fclose (output_file); // Activate POA manager - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Wait for calls - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index a5d874386e6..bb4e1860336 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -111,7 +111,6 @@ test_codec (IOP::Codec_ptr codec) // includes the TypeCode in the CDR encapsulation. encoded_data = codec->encode (data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ()) % ACE_CDR::MAX_ALIGNMENT) == 0) @@ -121,7 +120,6 @@ test_codec (IOP::Codec_ptr codec) // Extract the data from the octet sequence. decoded_data = codec->decode (encoded_data.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(decoded_data.in() >>= extracted_value)) ACE_ERROR_RETURN ((LM_ERROR, @@ -148,7 +146,6 @@ test_codec (IOP::Codec_ptr codec) // *not* include the TypeCode in the CDR encapsulation. encoded_data = codec->encode_value (data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ()) % ACE_CDR::MAX_ALIGNMENT) == 0) @@ -161,7 +158,6 @@ test_codec (IOP::Codec_ptr codec) decoded_data = codec->decode_value (encoded_data.in (), Foo::_tc_Bar ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(decoded_data.in() >>= extracted_value)) ACE_ERROR_RETURN ((LM_ERROR, @@ -193,18 +189,15 @@ main (int argc, char *argv[]) argv, "my_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain a reference to the CodecFactory. CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IOP::CodecFactory_var codec_factory = IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Set up a structure that contains information necessary to // create a GIOP 1.1 CDR encapsulation Codec. @@ -219,7 +212,6 @@ main (int argc, char *argv[]) IOP::Codec_var codec_1_2 = codec_factory->create_codec_with_codesets (encoding_1_2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; retval = test_codec (codec_1_2.in ()); @@ -236,7 +228,6 @@ main (int argc, char *argv[]) IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; retval = test_codec (codec.in ()); } diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp index 19bd6433a70..a075b5c6965 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/Collocation.cpp @@ -12,13 +12,10 @@ int main (int argc, char *argv[]) Collocation_Test coll_test; coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coll_test.run (); - coll_test.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coll_test.shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index 87fba9ceb92..ce1cbb86569 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -21,12 +21,10 @@ Collocation_Test::Collocation_Test (void) } void -Collocation_Test::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Test::shutdown (void) { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->destroy (); } int @@ -34,7 +32,6 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB. this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); int result = this->parse_args (argc, argv); if (result != 0) @@ -43,52 +40,42 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) // Get an Object reference to RootPOA. CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Narrow the Object reference to a POA reference this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POAManager of RootPOA this->poa_manager_ = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->root_poa_->the_POAManager (); // Activate the diamond servant and its base classes under RootPOA. PortableServer::ObjectId_var id = this->root_poa_->activate_object (&this->top_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // // We only care about the most derived class here. -// this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); -// ACE_CHECK_RETURN (-1); +// this->diamond_obj_ = this->diamond_servant_._this (); id = this->root_poa_->activate_object (&this->diamond_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // We only care about the most derived class here. this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->left_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->right_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::String_var str = this->orb_->object_to_string (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", str.in())); @@ -106,51 +93,41 @@ Collocation_Test::parse_args (int /*argc*/, } int -Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Test::test_narrow (void) { Diamond::Top_var top = Diamond::Top::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Left_var left = Diamond::Left::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Right_var right = Diamond::Right::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Buttom_var buttom = Diamond::Buttom::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + CORBA::String_var str = top->shape (); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); - str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = left->shape (); ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ())); - str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = right->shape (); ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ())); - str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = buttom->shape (); ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ())); return 0; } int -Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Test::run (void) { - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_manager_->activate (); - this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->test_narrow (); return 0; } diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h index 131e18003dd..fa8a0f690bf 100644 --- a/TAO/tests/Collocation/Collocation_Tester.h +++ b/TAO/tests/Collocation/Collocation_Tester.h @@ -29,7 +29,7 @@ class Collocation_Test public: Collocation_Test (void); - void shutdown (ACE_ENV_SINGLE_ARG_DECL); + void shutdown (void); int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED); // Initializing the Collocation_Test object. @@ -37,11 +37,11 @@ public: int parse_args (int argc, char *argv[]); // Parse the test specific arguments. - int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int test_narrow (void); // This test narrow an object reference to its base class and see // if it works correctly. - int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int run (void); // Run the test. private: diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp index f94a35d2c4b..1aed52ccf2f 100644 --- a/TAO/tests/Collocation/Diamond_i.cpp +++ b/TAO/tests/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Top_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::width (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::width (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::name (void) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h index 9e248a81dbd..e57cf1a6468 100644 --- a/TAO/tests/Collocation/Diamond_i.h +++ b/TAO/tests/Collocation/Diamond_i.h @@ -17,7 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -29,11 +29,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -45,15 +45,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long width (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -65,19 +65,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long width (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp index 960fef211e1..e5cafff6bc8 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp @@ -21,8 +21,7 @@ Client_Task::test_system_exception ( { ACE_TRY { - hello_ptr->system_exception_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_ptr->system_exception_test (); } ACE_CATCH (CORBA::INTERNAL, ex) { @@ -36,7 +35,6 @@ Client_Task::test_system_exception ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } void @@ -45,8 +43,7 @@ Client_Task::test_user_exception_expected ( { ACE_TRY { - hello_ptr->user_exception_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_ptr->user_exception_expected (); } ACE_CATCH (::Test::Hello::A, ex) { @@ -60,7 +57,6 @@ Client_Task::test_user_exception_expected ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } void @@ -69,8 +65,7 @@ Client_Task::test_user_exception_not_expected ( { ACE_TRY { - hello_ptr->user_exception_not_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_ptr->user_exception_not_expected (); } ACE_CATCH (CORBA::UNKNOWN, ex) { @@ -84,7 +79,6 @@ Client_Task::test_user_exception_not_expected ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } int @@ -95,11 +89,9 @@ Client_Task::svc (void) CORBA::Object_var tmp = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -110,23 +102,18 @@ Client_Task::svc (void) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); this->test_system_exception (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->test_user_exception_expected (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->test_user_exception_not_expected (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp index f4e4a6b9615..500e72adc88 100644 --- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -58,7 +58,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -82,7 +81,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp index c9ca732b3cc..2d01e524ae7 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.cpp +++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp @@ -15,34 +15,34 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") } void -Hello::system_exception_test (ACE_ENV_SINGLE_ARG_DECL) +Hello::system_exception_test (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::INTERNAL ()); } void -Hello::user_exception_expected (ACE_ENV_SINGLE_ARG_DECL) +Hello::user_exception_expected (void) ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)) { ACE_THROW (::Test::Hello::A ()); } void -Hello::user_exception_not_expected (ACE_ENV_SINGLE_ARG_DECL) +Hello::user_exception_not_expected (void) ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)) { - this->throw_internal_b (ACE_ENV_SINGLE_ARG_PARAMETER); + this->throw_internal_b (); } void -Hello::throw_internal_b (ACE_ENV_SINGLE_ARG_DECL) +Hello::throw_internal_b (void) { ACE_THROW (::Test::Hello::B ()); } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -85,7 +85,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h index 0e0d044b6e9..bb4f2265ec4 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.h +++ b/TAO/tests/Collocation_Exception_Test/Hello.h @@ -25,23 +25,23 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void system_exception_test (ACE_ENV_SINGLE_ARG_DECL) + virtual void system_exception_test (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void user_exception_expected (ACE_ENV_SINGLE_ARG_DECL) + virtual void user_exception_expected (void) ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)); - virtual void user_exception_not_expected (ACE_ENV_SINGLE_ARG_DECL) + virtual void user_exception_not_expected (void) ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: - void throw_internal_b (ACE_ENV_SINGLE_ARG_DECL); + void throw_internal_b (void); /// Use an ORB reference to conver strings to objects and shutdown /// the application. diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 746c3ff7758..8129e39ffc9 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -31,12 +31,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +42,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -56,13 +53,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,22 +71,18 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index 216bcba8cf8..16a2d78e815 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -29,11 +29,9 @@ Client_Task::svc (void) CORBA::Object_var tmp = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -70,11 +68,9 @@ Client_Task::svc (void) polList.length(1); polList[0] = this->corb_->create_policy( Messaging::SYNC_SCOPE_POLICY_TYPE, anyPolicy ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var tmpGenericVar = tmpVar->_set_policy_overrides(polList,CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // do unchecked narrow because ORB's not activated. Otherwise get TRANSIENT exception hello = Test::Hello::_narrow(tmpGenericVar.in()); @@ -88,19 +84,16 @@ Client_Task::svc (void) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->onewayTest(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->onewayTest(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - returned from onewayTest() call \n")); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp index f36e0cd48f9..b5f46a9d86d 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp @@ -83,7 +83,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -107,7 +106,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp index e4f3c6d80d7..7a212ffe621 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp @@ -15,7 +15,7 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") } void -Hello::onewayTest (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::onewayTest (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -25,7 +25,7 @@ Hello::onewayTest (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -68,7 +68,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h index c145e77f7c1..6ac1109f422 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.h +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h @@ -25,13 +25,13 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void onewayTest (ACE_ENV_SINGLE_ARG_DECL) + virtual void onewayTest (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index 746c3ff7758..8129e39ffc9 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -31,12 +31,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +42,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -56,13 +53,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,22 +71,18 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 28aa663f7aa..576ad700566 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -19,10 +19,10 @@ public: void set_other (test_ptr test); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); CORBA::ORB_var orb_; @@ -44,12 +44,10 @@ test_i::test_i (CORBA::ORB_ptr orb, object = this->orb_->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->poa_current_ = PortableServer::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -59,13 +57,12 @@ test_i::set_other (test_ptr test) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->other_.in () != test::_nil ()) { - this->other_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->other_->method (); } else { @@ -83,8 +80,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) upcall = "remote"; PortableServer::ObjectId_var id = - this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->poa_current_->get_object_id (); CORBA::String_var id_string = PortableServer::ObjectId_to_string (id.in ()); @@ -97,7 +93,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -124,8 +120,7 @@ Task::svc (void) { ACE_TRY_NEW_ENV { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -145,24 +140,19 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Task task (orb.in ()); @@ -177,20 +167,17 @@ main (int argc, char *argv[]) policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child_poa", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i *base_servant = new test_i (orb.in (), child_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_base_servant (base_servant); @@ -200,17 +187,14 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (base_oid.in (), base_servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var base_test = - base_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + base_servant->_this (); test_i *first_servant = new test_i (orb.in (), child_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_first_servant (first_servant); @@ -220,16 +204,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (first_oid.in (), first_servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var first_test = - first_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + first_servant->_this (); base_servant->set_other (first_test.in ()); - base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + base_test->method (); PortableServer::ObjectId_var second_oid = PortableServer::string_to_ObjectId ("second"); @@ -238,30 +219,25 @@ main (int argc, char *argv[]) child_poa->create_reference_with_id (second_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var second_test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i *second_servant = new test_i (orb.in (), child_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_second_servant (second_servant); child_poa->activate_object_with_id (second_oid.in (), second_servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; base_servant->set_other (second_test.in ()); - base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + base_test->method (); PortableServer::ObjectId_var third_oid = PortableServer::string_to_ObjectId ("third"); @@ -270,44 +246,36 @@ main (int argc, char *argv[]) child_poa->create_reference_with_id (third_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var third_ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->string_to_object (third_ior.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var third_test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i *third_servant = new test_i (orb.in (), child_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_third_servant (third_servant); child_poa->activate_object_with_id (third_oid.in (), third_servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; base_servant->set_other (third_test.in ()); - base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + base_test->method (); orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = task.wait (); diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp index 1b1e5ceed10..f96eaf80861 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Tests/Client_Task.cpp @@ -25,11 +25,9 @@ Client_Task::svc (void) CORBA::Object_var tmp = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -40,14 +38,12 @@ Client_Task::svc (void) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp index f807f7bf5b3..57f11732206 100644 --- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp @@ -56,7 +56,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -80,7 +79,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -97,12 +95,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } } ACE_CATCHANY diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp index 35bc75253ab..5db019621a9 100644 --- a/TAO/tests/Collocation_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Tests/Hello.cpp @@ -15,7 +15,7 @@ ACE_RCSID(Hello, Hello, "$Id$") } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -58,7 +58,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h index ba9e6637812..63b4ec180be 100644 --- a/TAO/tests/Collocation_Tests/Hello.h +++ b/TAO/tests/Collocation_Tests/Hello.h @@ -20,10 +20,10 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp index 85d842d34a0..240d10c264e 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Tests/Server_Task.cpp @@ -31,12 +31,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -44,8 +42,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -56,13 +53,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -76,14 +71,12 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp index d4bf6f8eb18..ecbadf07435 100644 --- a/TAO/tests/Compression/server.cpp +++ b/TAO/tests/Compression/server.cpp @@ -19,7 +19,6 @@ test_invalid_compression_factory (Compression::CompressionManager_ptr cm) // Get an invalid compression factory Compression::CompressorFactory_var factory = cm->get_factory (100); - ACE_TRY_CHECK; } ACE_CATCH (Compression::UnknownCompressorId, ex) { @@ -51,7 +50,6 @@ test_duplicate_compression_factory ( { // Register duplicate cm->register_factory (cf); - ACE_TRY_CHECK; } ACE_CATCH (Compression::FactoryAlreadyRegistered, ex) { @@ -81,7 +79,6 @@ test_register_nil_compression_factory ( { // Register nil factory cm->register_factory (Compression::CompressorFactory::_nil()); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, ex) { @@ -113,7 +110,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var compression_manager = orb->resolve_initial_references("CompressionManager"); @@ -171,8 +167,7 @@ main (int argc, char *argv[]) if (!test_invalid_compression_factory (manager.in ())) retval = 1; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp index ca23555f202..73b12934ac8 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.cpp +++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp @@ -12,14 +12,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.h +++ b/TAO/tests/Connect_Strategy_Test/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp index 07d0572d547..a8649d9ab7d 100644 --- a/TAO/tests/Connect_Strategy_Test/client.cpp +++ b/TAO/tests/Connect_Strategy_Test/client.cpp @@ -45,18 +45,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -67,20 +64,17 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); if (do_shutdown) { - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index acd62195b16..020f4649f81 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp index c9759652961..c6b661375ea 100644 --- a/TAO/tests/Connection_Failure/client.cpp +++ b/TAO/tests/Connection_Failure/client.cpp @@ -19,15 +19,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // First connection happens here.. test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient_exception) { diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index 3ef97cea443..85a9a04835e 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -40,7 +40,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -60,11 +59,9 @@ main (int argc, char *argv[]) iorfile = "file://" + iorfile; CORBA::Object_var tmp = orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -104,10 +101,8 @@ main (int argc, char *argv[]) } orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index 0a9c8394ebf..706a22d6029 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -39,15 +39,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,8 +52,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -68,12 +64,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -85,20 +79,16 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); delete test_impl; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp index 5a8556e908a..8f2bc44fae1 100644 --- a/TAO/tests/Connection_Timeout/client.cpp +++ b/TAO/tests/Connection_Timeout/client.cpp @@ -51,7 +51,6 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) // First connection happens here.. Test::Hello_var hello = Test::Hello::_narrow(object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -62,14 +61,12 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { @@ -83,20 +80,6 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) // Give a 30% error margin for handling exceptions etc. It is a // high margin, though!. But the timeout is too small and wider // range would help. -#if defined (ACE_LACKS_FLOATING_POINT) && (ACE_LACKS_FLOATING_POINT != 0) - // The elapsed time is in usecs - if (el.real_time > 200000) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) ERROR: Too long to timeout: %u \n", - el.real_time), - 1); - } - else - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Success, timeout: %u \n", - el.real_time)); -#else // The elapsed time is in secs if (el.real_time > 0.200) { @@ -109,8 +92,6 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Success, timeout: %F \n", el.real_time)); - -#endif /* ACE_LACKS_FLOATING_POINT == 1*/ } ACE_ENDTRY; @@ -126,23 +107,19 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any timeout_as_any; timeout_as_any <<= timeout_period; @@ -153,26 +130,21 @@ main (int argc, char *argv[]) orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE, timeout_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong l = 0; l != policy_list.length (); ++l) { - policy_list[l]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[l]->destroy (); } retval = test_timeout (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp index 59b0bcb3398..ea9818cc706 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -10,7 +10,7 @@ Oneway_Receiver::Oneway_Receiver (void) } void -Oneway_Receiver::receive_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Receiver::receive_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index fae5e073bae..167206a943b 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -17,7 +17,7 @@ public: Oneway_Receiver (void); // = The skeleton methods - virtual void receive_oneway (ACE_ENV_SINGLE_ARG_DECL) + virtual void receive_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index 92fc7daaf0b..d3d1bac8953 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -46,8 +46,7 @@ single_iteration (Test::Oneway_Receiver_ptr oneway_receiver { ACE_TRY { - oneway_receiver->receive_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_receiver->receive_oneway (); ACE_Time_Value tv (0, 40000); ACE_OS::sleep (tv); } @@ -66,18 +65,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Oneway_Receiver_var oneway_receiver = Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (oneway_receiver.in ())) { @@ -93,7 +89,6 @@ main (int argc, char *argv[]) { int result = single_iteration (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result) exception_count++; else @@ -109,8 +104,7 @@ main (int argc, char *argv[]) if (normal_count == 0) ACE_ERROR ((LM_ERROR, "ERROR: no request was succesful\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 8c25517be99..f6920c41f0f 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_receiver_impl->_this (); CORBA::String_var ior = orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,8 +81,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Create a separate thread to crash the server. Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(20)); @@ -99,17 +92,14 @@ main (int argc, char *argv[]) return 1; } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); /*NOTREACHED*/ ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index a702cdce43d..5d96a31ec01 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -10,14 +10,14 @@ Crashed_Callback::Crashed_Callback (void) } CORBA::Boolean -Crashed_Callback::are_you_there (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::are_you_there (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::crash_now_please (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -34,7 +34,7 @@ Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Crashed_Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::test_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index 5a0614f1b74..3efa13bd774 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -17,13 +17,13 @@ public: Crashed_Callback (void); // = The skeleton methods - virtual CORBA::Boolean are_you_there (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Boolean are_you_there (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void crash_now_please (ACE_ENV_SINGLE_ARG_DECL) + virtual void crash_now_please (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL) + virtual void test_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index d4786b4fb6c..a69f882baf0 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -27,24 +27,20 @@ Service::run_test (Test::Crashed_Callback_ptr callback { int pre_crash_exceptions = this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK; pre_crash_exceptions += this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling crash_now_please\n")); - callback->crash_now_please (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback->crash_now_please (); } ACE_CATCHANY {} ACE_ENDTRY; int pos_crash_exceptions = this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (pre_crash_exceptions != 0) { @@ -81,8 +77,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback { ACE_TRY { - (void) callback->are_you_there (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) callback->are_you_there (); } ACE_CATCHANY { @@ -106,8 +101,7 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback { ACE_TRY { - (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) callback->test_oneway (); } ACE_CATCHANY { diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 4f020c7d89c..29e6911f75d 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -42,15 +42,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,19 +55,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,15 +77,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); } if (parse_args (argc, argv) != 0) @@ -99,11 +90,9 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Service_var service = Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (service.in ())) { @@ -120,23 +109,17 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(crashed_callback_impl); Test::Crashed_Callback_var crashed_callback = - crashed_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + crashed_callback_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); service->run_test (crashed_callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 11b8a975a14..e9cec1fbd91 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,19 +56,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,15 +78,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); } if (parse_args (argc, argv) != 0) @@ -105,12 +96,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(service_impl); Test::Service_var service = - service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + service_impl->_this (); CORBA::String_var ior = orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -122,22 +111,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Time_Value tv (50, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); service_impl->dump_results (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index f7c3f321248..f4a02e95052 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -36,8 +36,7 @@ Client_Task::svc (void) { CORBA::Object_var obj = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + if (CORBA::is_nil (obj.in ())) { ACE_ERROR_RETURN ((LM_DEBUG, @@ -48,8 +47,7 @@ Client_Task::svc (void) CORBA::Object_var simple_test_obj = this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + if (CORBA::is_nil (simple_test_obj.in ())) { ACE_ERROR_RETURN ((LM_DEBUG, @@ -58,42 +56,34 @@ Client_Task::svc (void) 1); } - Test::Simple_Test_var simple_test + Test::Simple_Test_var simple_test = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; req->add_in_arg ("basic") <<= TEST_BASIC_VALUE; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_unbounded_string_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("ub_string") <<= TEST_STR; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_bounded_string_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_CString bs (TEST_STR); bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE); - req->add_in_arg ("bd_string") + req->add_in_arg ("bd_string") <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_fixed_array_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::Fixed_Array fixed_array; @@ -103,159 +93,136 @@ Client_Task::svc (void) } req->add_in_arg ("fixed_array") <<= ::Test::Fixed_Array_forany (fixed_array); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_var_array_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::Var_Array var_array; for (CORBA::ULong i = 0; i < ::Test::VAR_ARRAY_SIZE; ++i) - { + { var_array[i] = CORBA::string_dup(TEST_STR); } req->add_in_arg ("var_array") <<= var_array; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_bounded_var_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_CString bvs (TEST_STR); bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE); - ::Test::Bounded_Var_Size_Arg* bd_var_size + ::Test::Bounded_Var_Size_Arg* bd_var_size = new ::Test::Bounded_Var_Size_Arg(); bd_var_size->replace (::Test::BOUNDED_VAR_SIZE, const_cast <CORBA::Char*> (bvs.c_str ())); req->add_in_arg ("bd_var_size") <<= bd_var_size; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_unbounded_var_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ::Test::Unbounded_Var_Size_Arg* ub_var_size + ::Test::Unbounded_Var_Size_Arg* ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); ub_var_size->replace (ub_var_size->maximum (), ACE_OS::strlen (TEST_STR), TEST_STR); req->add_in_arg ("ub_var_size") <<= ub_var_size; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_fixed_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::TimeOfDay t; - t.hour = TEST_HOUR; + t.hour = TEST_HOUR; t.minute = TEST_MINUTE; t.second = TEST_SECOND; req->add_in_arg ("fixed_size") <<= t; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_special_basic_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_object_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("object") <<= simple_test_obj.in (); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_objref_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("objref") <<= simple_test.in (); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_args_1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("arg1") <<= simple_test_obj.in (); req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); req->add_in_arg ("arg3") <<= simple_test.in (); - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_args_2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("arg1") <<= TEST_STR; req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array); req->add_in_arg ("arg3") <<= t; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("test_args_3" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - bd_var_size + bd_var_size = new ::Test::Bounded_Var_Size_Arg(); bd_var_size->replace (::Test::BOUNDED_VAR_SIZE, const_cast <CORBA::Char*> (bvs.c_str ())); - ub_var_size + ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); ub_var_size->replace (ub_var_size->maximum (), ACE_OS::strlen (TEST_STR), TEST_STR); for (CORBA::ULong j = 0; j < ::Test::VAR_ARRAY_SIZE; ++j) - { + { var_array[j] = CORBA::string_dup(TEST_STR); } - req->add_in_arg ("arg1") + req->add_in_arg ("arg1") <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE); req->add_in_arg ("arg2") <<= bd_var_size; req->add_in_arg ("arg3") <<= ub_var_size; req->add_in_arg ("arg4") <<= var_array; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + req = obj->_request ("shutdown" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + } ACE_CATCHANY @@ -277,7 +244,7 @@ Client_Task::svc (void) } -CORBA::ULong +CORBA::ULong Client_Task::error_count () const { return error_count_; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp index ccf9170dc2a..13f6ba38c74 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp @@ -65,7 +65,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -90,7 +89,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, simple_test_input, @@ -108,12 +106,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } CORBA::ULong errors = client_task.error_count () + server_task.error_count (); diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 77c4257f203..05d9fd122ca 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -52,7 +52,7 @@ Hello::Hello (CORBA::ORB_ptr orb, { } -void +void Hello::test_basic_arg ( ::CORBA::Long basic ACE_ENV_ARG_DECL @@ -65,14 +65,14 @@ Hello::test_basic_arg ( ERROR_COUNT ("Hello::test_basic_arg") } -void +void Hello::test_unbounded_string_arg(const char* message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ") - ACE_TEXT("got unbounded string: %s\n"), + ACE_TEXT("got unbounded string: %s\n"), message)); if (ACE_OS::strncmp (message, TEST_STR, strlen (TEST_STR) != 0)) { @@ -81,14 +81,14 @@ Hello::test_unbounded_string_arg(const char* message } -void +void Hello::test_bounded_string_arg(const char* message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ") - ACE_TEXT("got bounded string: %s\n"), + ACE_TEXT("got bounded string: %s\n"), message)); if (ACE_OS::strncmp (message, TEST_STR, ::Test::BOUNDED_STRING_SIZE) != 0) { @@ -97,7 +97,7 @@ Hello::test_bounded_string_arg(const char* message } -void +void Hello::test_fixed_array_arg(const ::Test::Fixed_Array message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -106,7 +106,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_array_arg ") - ACE_TEXT("got fixed array: %d\n"), + ACE_TEXT("got fixed array: %d\n"), message[i])); if (message[i] != static_cast<CORBA::Long> (i + 999)) ERROR_COUNT ("Hello::test_fixed_array_arg") @@ -114,7 +114,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message } -void +void Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -127,7 +127,7 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message } -void +void Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -140,7 +140,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message } -void +void Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -150,14 +150,14 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t ACE_TEXT("got timeofday: %d:%d:%d\n"), t.hour, t.minute, t.second)); - if (t.hour != TEST_HOUR - || t.minute != TEST_MINUTE + if (t.hour != TEST_HOUR + || t.minute != TEST_MINUTE || t.second != TEST_SECOND) ERROR_COUNT ("Hello::test_fixed_size_arg") } -void +void Hello::test_var_array_arg(const Test::Var_Array messages ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -173,7 +173,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages } -void +void Hello::test_special_basic_arg(CORBA::Char value ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException)) @@ -199,14 +199,13 @@ void Hello::test_objref_arg ( if (CORBA::is_nil (test)) ERROR_COUNT ("Hello::test_objref_arg") - else + else { // Increment the error_count before calling test_method() and decrement // the error_count when the server handling the test_method() call. CORBA::ULong error_count = 0; error_count ++; test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { ERROR_COUNT ("Hello::test_objref_arg") @@ -225,11 +224,10 @@ void Hello::test_object_arg ( if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n"))); ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o); - + CORBA::ULong error_count = 0; error_count ++; simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { ERROR_COUNT ("Hello::test_object_arg") @@ -249,14 +247,12 @@ void Hello::test_args_1 ( if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n"))); ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1); - + CORBA::ULong error_count = 0; error_count ++; simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; error_count ++; arg3->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { @@ -281,15 +277,15 @@ void Hello::test_args_2 ( ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n"))); if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 ) ERROR_COUNT ("Hello::test_args_2") - + for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) { if (arg2[i] != static_cast<CORBA::Long> (i + 999)) ERROR_COUNT ("Hello::test_args_2") } - if (arg3.hour != TEST_HOUR - || arg3.minute != TEST_MINUTE + if (arg3.hour != TEST_HOUR + || arg3.minute != TEST_MINUTE || arg3.second != TEST_SECOND) ERROR_COUNT ("Hello::test_args_2") } @@ -321,7 +317,7 @@ void Hello::test_args_3 ( } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -359,7 +355,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::string_dup ("Hello there!"); } -char * +char * Hello::test_unbounded_string ( const char * s1, char *& s2, @@ -380,7 +376,7 @@ Hello::test_unbounded_string ( } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index 8dde8446d54..a72caaab113 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -10,16 +10,16 @@ #include "ace/OS.h" -class Test_Simple_Test_i +class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { public: - //Constructor + //Constructor Test_Simple_Test_i (void); - - //Destructor + + //Destructor virtual ~Test_Simple_Test_i (void); - + virtual void test_method ( ::CORBA::ULong & error_count @@ -57,7 +57,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_bounded_string_arg ( const char * message @@ -66,7 +66,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_fixed_array_arg ( const ::Test::Fixed_Array message @@ -75,7 +75,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_var_array_arg ( const ::Test::Var_Array messages @@ -84,7 +84,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message @@ -93,7 +93,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message @@ -102,7 +102,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t @@ -111,7 +111,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_special_basic_arg ( ::CORBA::Char value @@ -120,7 +120,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_objref_arg ( ::Test::Simple_Test_ptr test @@ -129,7 +129,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_object_arg ( ::CORBA::Object_ptr o @@ -138,7 +138,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_1 ( ::CORBA::Object_ptr arg1, @@ -149,7 +149,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_2 ( const char * arg1, @@ -160,7 +160,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_3 ( const char * arg1, @@ -173,7 +173,7 @@ public: CORBA::SystemException )); - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual @@ -186,8 +186,8 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); 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 15754f7aaf3..6d842101da5 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -34,12 +34,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -47,8 +45,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl; ACE_NEW_RETURN (hello_impl, @@ -59,13 +56,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -87,13 +82,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer_simple(simple_impl); Test::Simple_Test_var simple_test = - simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_impl->_this (); CORBA::String_var simple_test_ior = this->sorb_->object_to_string (simple_test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_, @@ -107,14 +100,12 @@ Server_Task::svc (void) ACE_OS::fprintf (simple_test_output_file, "%s", simple_test_ior.in ()); ACE_OS::fclose (simple_test_output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); @@ -142,7 +133,7 @@ Server_Task::svc (void) return 0; } -CORBA::ULong +CORBA::ULong Server_Task::error_count () const { return error_count_; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index f4bbfe757e4..199301ed2cf 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -36,8 +36,7 @@ Client_Task::svc (void) { CORBA::Object_var obj = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + if (CORBA::is_nil (obj.in ())) { ACE_ERROR_RETURN ((LM_DEBUG, @@ -48,8 +47,7 @@ Client_Task::svc (void) CORBA::Object_var simple_test_obj = this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + if (CORBA::is_nil (simple_test_obj.in ())) { ACE_ERROR_RETURN ((LM_DEBUG, @@ -58,46 +56,38 @@ Client_Task::svc (void) 1); } - Test::Simple_Test_var simple_test + Test::Simple_Test_var simple_test = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long l = 200; CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; req->add_in_arg ("basic") <<= TEST_BASIC_VALUE; - req->add_out_arg ("x") <<= l; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + req->add_out_arg ("x") <<= l; + req->invoke (); if (req->response_received ()) { - + } req = obj->_request ("test_unbounded_string_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("ub_string") <<= TEST_STR; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_bounded_string_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_CString bs (TEST_STR); bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE); - req->add_in_arg ("bd_string") + req->add_in_arg ("bd_string") <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_fixed_array_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::Fixed_Array fixed_array; @@ -107,159 +97,136 @@ CORBA::Long l = 200; } req->add_in_arg ("fixed_array") <<= ::Test::Fixed_Array_forany (fixed_array); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_var_array_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::Var_Array var_array; for (CORBA::ULong i = 0; i < ::Test::VAR_ARRAY_SIZE; ++i) - { + { var_array[i] = CORBA::string_dup(TEST_STR); } req->add_in_arg ("var_array") <<= var_array; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_bounded_var_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_CString bvs (TEST_STR); bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE); - ::Test::Bounded_Var_Size_Arg* bd_var_size + ::Test::Bounded_Var_Size_Arg* bd_var_size = new ::Test::Bounded_Var_Size_Arg(); bd_var_size->replace (::Test::BOUNDED_VAR_SIZE, const_cast <CORBA::Char*> (bvs.c_str ())); req->add_in_arg ("bd_var_size") <<= bd_var_size; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_unbounded_var_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ::Test::Unbounded_Var_Size_Arg* ub_var_size + ::Test::Unbounded_Var_Size_Arg* ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); ub_var_size->replace (ub_var_size->maximum (), ACE_OS::strlen (TEST_STR), TEST_STR); req->add_in_arg ("ub_var_size") <<= ub_var_size; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_fixed_size_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::Test::TimeOfDay t; - t.hour = TEST_HOUR; + t.hour = TEST_HOUR; t.minute = TEST_MINUTE; t.second = TEST_SECOND; req->add_in_arg ("fixed_size") <<= t; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_special_basic_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_object_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("object") <<= simple_test_obj.in (); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_objref_arg" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("objref") <<= simple_test.in (); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_args_1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("arg1") <<= simple_test_obj.in (); req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); req->add_in_arg ("arg3") <<= simple_test.in (); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_args_2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; req->add_in_arg ("arg1") <<= TEST_STR; req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array); req->add_in_arg ("arg3") <<= t; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("test_args_3" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - bd_var_size + bd_var_size = new ::Test::Bounded_Var_Size_Arg(); bd_var_size->replace (::Test::BOUNDED_VAR_SIZE, const_cast <CORBA::Char*> (bvs.c_str ())); - ub_var_size + ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); ub_var_size->replace (ub_var_size->maximum (), ACE_OS::strlen (TEST_STR), TEST_STR); for (CORBA::ULong j = 0; j < ::Test::VAR_ARRAY_SIZE; ++j) - { + { var_array[j] = CORBA::string_dup(TEST_STR); } - req->add_in_arg ("arg1") + req->add_in_arg ("arg1") <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE); req->add_in_arg ("arg2") <<= bd_var_size; req->add_in_arg ("arg3") <<= ub_var_size; req->add_in_arg ("arg4") <<= var_array; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->invoke (); + req = obj->_request ("shutdown" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + req->send_oneway (); + } ACE_CATCHANY @@ -281,7 +248,7 @@ CORBA::Long l = 200; } -CORBA::ULong +CORBA::ULong Client_Task::error_count () const { return error_count_; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp index 3e2bab6c3fc..4d831212bad 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp @@ -69,7 +69,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -94,7 +93,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, simple_test_input, @@ -112,12 +110,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Now that all threads have completed we can destroy the ORB - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); if (server_orb != client_orb) { - corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + corb->destroy (); } CORBA::ULong errors = client_task.error_count () + server_task.error_count (); diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index f11634ae374..78cdaa8e2ad 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -202,14 +202,13 @@ void Hello::test_objref_arg ( if (CORBA::is_nil (test)) ERROR_COUNT ("Hello::test_objref_arg") - else + else { // Increment the error_count before calling test_method() and decrement // the error_count when the server handling the test_method() call. CORBA::ULong error_count = 0; error_count ++; test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { ERROR_COUNT ("Hello::test_objref_arg") @@ -228,11 +227,10 @@ void Hello::test_object_arg ( if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n"))); ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o); - + CORBA::ULong error_count = 0; error_count ++; simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { ERROR_COUNT ("Hello::test_object_arg") @@ -252,14 +250,12 @@ void Hello::test_args_1 ( if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n"))); ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1); - + CORBA::ULong error_count = 0; error_count ++; simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; error_count ++; arg3->test_method (error_count ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (error_count != 0) { @@ -284,15 +280,15 @@ void Hello::test_args_2 ( ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n"))); if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 ) ERROR_COUNT ("Hello::test_args_2") - + for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) { if (arg2[i] != static_cast<CORBA::Long> (i + 999)) ERROR_COUNT ("Hello::test_args_2") } - if (arg3.hour != TEST_HOUR - || arg3.minute != TEST_MINUTE + if (arg3.hour != TEST_HOUR + || arg3.minute != TEST_MINUTE || arg3.second != TEST_SECOND) ERROR_COUNT ("Hello::test_args_2") } @@ -324,7 +320,7 @@ void Hello::test_args_3 ( } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -362,7 +358,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::string_dup ("Hello there!"); } -char * +char * Hello::test_unbounded_string ( const char * s1, char *& s2, @@ -383,7 +379,7 @@ Hello::test_unbounded_string ( } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h index 37271331d77..1b98b672e49 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h @@ -10,16 +10,16 @@ #include "ace/OS.h" -class Test_Simple_Test_i +class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { public: - //Constructor + //Constructor Test_Simple_Test_i (void); - - //Destructor + + //Destructor virtual ~Test_Simple_Test_i (void); - + virtual void test_method ( ::CORBA::ULong & error_count @@ -58,7 +58,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_bounded_string_arg ( const char * message @@ -67,7 +67,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_fixed_array_arg ( const ::Test::Fixed_Array message @@ -76,7 +76,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_var_array_arg ( const ::Test::Var_Array messages @@ -85,7 +85,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message @@ -94,7 +94,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message @@ -103,7 +103,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t @@ -112,7 +112,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_special_basic_arg ( ::CORBA::Char value @@ -121,7 +121,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_objref_arg ( ::Test::Simple_Test_ptr test @@ -130,7 +130,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_object_arg ( ::CORBA::Object_ptr o @@ -139,7 +139,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_1 ( ::CORBA::Object_ptr arg1, @@ -150,7 +150,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_2 ( const char * arg1, @@ -161,7 +161,7 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void test_args_3 ( const char * arg1, @@ -174,7 +174,7 @@ public: CORBA::SystemException )); - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual @@ -187,8 +187,8 @@ public: ACE_THROW_SPEC (( CORBA::SystemException )); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp index 4f901730471..7fe8450cec0 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp @@ -32,12 +32,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -45,8 +43,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, @@ -57,13 +54,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -85,13 +80,11 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer_simple(simple_impl); Test::Simple_Test_var simple_test = - simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_impl->_this (); CORBA::String_var simple_test_ior = this->sorb_->object_to_string (simple_test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <this->output_> FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_, @@ -105,14 +98,12 @@ Server_Task::svc (void) ACE_OS::fprintf (simple_test_output_file, "%s", simple_test_ior.in ()); ACE_OS::fclose (simple_test_output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index f6cd461b12e..1fc1616bde9 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -91,7 +91,6 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) new_argv.get_buffer (), "CLIENT" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->orb_.in ())) return -1; @@ -101,11 +100,9 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) CORBA::Object_var obj = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->test_ = Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->test_.in ())) { @@ -123,7 +120,6 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); #if defined (ACE_HAS_THREADS) @@ -165,12 +161,10 @@ Test_Client_Module::svc (void) ACE_TRY { // Invoke an operation on the Test object. - this->test_->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->invoke_me (); /// Shutdown the remote ORB. - this->test_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->shutdown (); // Make sure the ORB is destroyed here - before the thread // exits, because it may be holding global resources, owned by @@ -183,8 +177,7 @@ Test_Client_Module::svc (void) // deleted resources. if (!CORBA::is_nil (this->orb_.in ())) { - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } // This is a bit of a hack. The ORB Core's lifetime is tied to the @@ -204,7 +197,6 @@ Test_Client_Module::svc (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 2bb64be76df..6293a6d79c3 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -92,14 +92,12 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) new_argv.get_buffer (), "SERVER" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->orb_.in ())) return -1; CORBA::Object_var poa_object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,23 +106,18 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) this->poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->poa_manager_ = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->poa_manager_ = this->poa_->the_POAManager (); - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->poa_manager_->activate (); if (::parse_args (new_argc, new_argv.get_buffer ()) != 0) return -1; - CORBA::Object_var obj = this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var obj = this->servant_._this (); CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", @@ -150,7 +143,6 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); #if defined (ACE_HAS_THREADS) @@ -192,8 +184,7 @@ Test_Server_Module::svc (void) ACE_TRY { // Run the ORB event loop in its own thread. - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); ACE_DEBUG ((LM_INFO, "Server is being destroyed.\n")); @@ -209,8 +200,7 @@ Test_Server_Module::svc (void) // deleted resources. if (!CORBA::is_nil (this->orb_.in ())) { - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } } ACE_CATCHANY @@ -220,7 +210,6 @@ Test_Server_Module::svc (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index aa8d19ec17b..7addbc89cef 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -20,7 +20,7 @@ Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAME } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index 9452bce731f..f22788d8dfc 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -34,11 +34,11 @@ public: /// Simple two-way operation used to excercise the ORB transport /// internals. - virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_me (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the ORB to be shutdown by the shutdown() method in this diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 8d1d133fb22..c2b3cd74038 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -67,7 +67,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) { @@ -76,11 +75,9 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -95,13 +92,11 @@ main (int argc, char *argv[]) if (test_user_exception == 1) { - server->raise_user_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->raise_user_exception (); } else if (test_system_exception == 1) { - server->raise_system_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->raise_system_exception (); } else { @@ -136,7 +131,6 @@ main (int argc, char *argv[]) the_out_structure.out (), name.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (TAO_debug_level > 0) { @@ -163,8 +157,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCH (test_exception, ex) diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index 4aade2c1f03..10cff9f4c34 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -60,11 +60,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -75,14 +73,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) { @@ -91,7 +86,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DSI_Simple_Server server_impl (orb.in (), object.in (), @@ -99,16 +93,13 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var oid = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var server = root_poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -129,8 +120,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index dfe1919fe78..4225a84ed95 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -62,11 +60,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) { @@ -76,12 +72,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -102,11 +96,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index ccd6466a93c..871e6d72203 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -17,10 +17,8 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request { CORBA::NVList_ptr list; this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; request->arguments (list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Request_var target_request; @@ -33,7 +31,6 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request target_request.inout (), 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; target_request->_tao_lazy_evaluation (1); @@ -43,8 +40,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request ACE_TRY { // Updates the byte order state, if necessary. - target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + target_request->invoke (); } ACE_CATCH (CORBA::UNKNOWN, ex) { @@ -65,7 +61,6 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -79,7 +74,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, } PortableServer::POA_ptr -DSI_Simple_Server::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +DSI_Simple_Server::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index 759578e6f6a..18e3806a5dd 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -39,7 +39,7 @@ Simple_Server_i::test_method (CORBA::Long x, } void -Simple_Server_i::raise_user_exception (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::raise_user_exception (void) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)) { @@ -49,21 +49,21 @@ Simple_Server_i::raise_user_exception (ACE_ENV_SINGLE_ARG_DECL) } void -Simple_Server_i::raise_system_exception (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::raise_system_exception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::NO_PERMISSION ()); } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } CORBA::Long -Simple_Server_i::test_val (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::test_val (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return vlong_; diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index 776a385b9e1..d485a551247 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -38,20 +38,20 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long test_val (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Long test_val (void) ACE_THROW_SPEC (( CORBA::SystemException)); void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void raise_user_exception (void) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)); - void raise_system_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void raise_system_exception (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp index 55bad99ed41..c7938aaedb2 100644 --- a/TAO/tests/DynAny_Test/analyzer.cpp +++ b/TAO/tests/DynAny_Test/analyzer.cpp @@ -83,19 +83,16 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = da->type (); - CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = tc->kind (); CORBA::TypeCode_var dup = CORBA::TypeCode::_duplicate (tc.in ()); // strip aliases while (kind == CORBA::tk_alias) { - dup = dup->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + dup = dup->content_type (); - kind = dup->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + kind = dup->kind (); } switch (kind) @@ -104,7 +101,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { DynamicAny::DynStruct_var ds = DynamicAny::DynStruct::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; tab (level_); @@ -121,12 +117,10 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) do { DynamicAny::DynAny_var cc = - ds->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ds->current_component (); DynamicAny::FieldName_var fn = - ds->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ds->current_member_name (); tab(level_); @@ -139,7 +133,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (!CORBA::is_nil (cc.in ())) { this->analyze (cc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } while (da->next ()); @@ -159,7 +152,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { DynamicAny::DynSequence_var ds = DynamicAny::DynSequence::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; int i = 0; tab(level_); @@ -183,12 +175,10 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) "[%d]\n", i)); DynamicAny::DynAny_var cc (ds->current_component ()); - ACE_CHECK; if (!CORBA::is_nil (cc.in ())) { analyze (cc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } i++; @@ -213,8 +203,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) level_++; CORBA::ULong const len = - dup->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + dup->length (); for (CORBA::ULong i = 0 ; i < len; ++i) { @@ -230,7 +219,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (!CORBA::is_nil (cc.in ())) { analyze (cc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } da->next (); @@ -243,7 +231,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { DynamicAny::DynUnion_var value = DynamicAny::DynUnion::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!value->has_no_active_member ()) { @@ -252,7 +239,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (!CORBA::is_nil (disc.in ())) { this->analyze (disc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -266,12 +252,10 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) dynany = dynany_factory_->create_dyn_any (any.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!CORBA::is_nil (dynany.in ())) { this->analyze (dynany.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } dynany->destroy (); @@ -282,7 +266,6 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { DynamicAny::DynEnum_var value = DynamicAny::DynEnum::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var s = value->get_as_string (); tab (level_); @@ -325,8 +308,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (debug_) { CORBA::TCKind const kind = - da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + da->get_typecode ()->kind (); ACE_DEBUG ((LM_DEBUG, " Value (TypeCode) = %d\n", @@ -342,8 +324,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (debug_) { CORBA::TCKind const kind = - tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + tc->kind (); ACE_DEBUG ((LM_DEBUG, " unhandled typecode = %d\n", diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h index 776c24ee9e6..dce4ba0aeed 100644 --- a/TAO/tests/DynAny_Test/analyzer.h +++ b/TAO/tests/DynAny_Test/analyzer.h @@ -23,7 +23,9 @@ class DynAnyAnalyzer { public: - DynAnyAnalyzer (CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug); + DynAnyAnalyzer (CORBA::ORB_ptr orb, + DynamicAny::DynAnyFactory_ptr dynany_factory, + int debug); void tab (int t); @@ -32,7 +34,7 @@ public: void resetTab (void); void analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL); - + void analyze_basic_seq (CORBA::TypeCode_ptr tc, DynamicAny::DynAny_ptr da); diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 55422d128f6..206e24d7cb6 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -44,7 +44,7 @@ Data::Data (CORBA::ORB_var orb) m_shortseq1[0UL] = 0; m_shortseq1[1UL] = 1; m_shortseq1[2UL] = 2; - + labels[0] = "type boolean"; labels[1] = "type octet"; labels[2] = "type char"; @@ -62,14 +62,13 @@ Data::Data (CORBA::ORB_var orb) labels[14] = "type any"; labels[15] = "type objref"; labels[16] = "type short sequence"; - + // Getting the RootPOA so we can generate object references. CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) { @@ -82,27 +81,23 @@ Data::Data (CORBA::ORB_var orb) PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Generate values for the member variables. this->m_objref1 = root_poa->create_reference ("foo" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->m_objref2 = root_poa->create_reference ("foo" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Clean up after the POA root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -110,7 +105,6 @@ Data::Data (CORBA::ORB_var orb) "Exception in ORB/POA init\n"); } ACE_ENDTRY; - ACE_CHECK; } Data::~Data (void) diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index b235f0d1872..3bef704e0e8 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -74,7 +74,6 @@ Driver::init (int argc, char* argv[]) "local" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args (argc, argv) == -1) @@ -115,7 +114,7 @@ Driver::parse_args (int argc, char* argv[]) { case 't': test_str = get_opts.opt_arg (); - + if (!ACE_OS::strcmp (test_str, "dynany")) this->test_type_ = TEST_DYNANY; else if (!ACE_OS::strcmp (test_str, "dynarray")) diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 35d7e1d1677..02ce71c105f 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -55,12 +55,10 @@ Test_DynAny::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -77,15 +75,12 @@ Test_DynAny::run_test (void) in1 <<= data.m_double2; DynamicAny::DynAny_var fa1 = dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; fa1->insert_double (data.m_double1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Double d_out = - fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_double (); if (d_out == data.m_double1) { @@ -104,16 +99,12 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var ftc1 = dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any in_any1; in_any1 <<= data.m_double1; ftc1->from_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any1 = ftc1->to_any (); out_any1 >>= d_out; if (d_out == data.m_double1) @@ -126,10 +117,8 @@ Test_DynAny::run_test (void) ++this->error_count_; } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); + ftc1->destroy (); ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -143,13 +132,10 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var fa2 = dynany_factory->create_dyn_any (in ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; fa2->insert_typecode (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::TypeCode_var tc_out = - fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa2->get_typecode (); if (tc_out->equal (data.m_typecode1 ACE_ENV_ARG_PARAMETER)) @@ -162,7 +148,6 @@ Test_DynAny::run_test (void) ++this->error_count_; } - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); @@ -170,22 +155,17 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var ftc2 = dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any in_any2; in_any2 <<= data.m_typecode1; ftc2->from_any (in_any2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any2 = ftc2->to_any (); CORBA::TypeCode_ptr out_tc; out_any2 >>= out_tc; CORBA::Boolean equal = out_tc->equal (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equal) { @@ -197,13 +177,10 @@ Test_DynAny::run_test (void) ++this->error_count_; } - ACE_TRY_CHECK; - fa2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa2->destroy (); + ftc2->destroy (); + ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", data.labels[16])); @@ -218,17 +195,14 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var fa3 = dynany_factory->create_dyn_any (in3 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; fa3->insert_short_seq (data.m_shortseq1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; data.m_shortseq2 = - fa3->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa3->get_short_seq (); + bool good = data.m_shortseq2->length () == data.m_shortseq1.length (); - + if (good) { for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) @@ -251,7 +225,6 @@ Test_DynAny::run_test (void) ++this->error_count_; } - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); @@ -259,23 +232,19 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var ftc3 = dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any in_any3; in_any3 <<= data.m_shortseq1; ftc3->from_any (in_any3 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc3.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any3 = ftc3->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + CORBA::Any_var out_any3 = ftc3->to_any (); + CORBA::ShortSeq *outseq = 0; out_any3.in () >>= outseq; good = outseq->length () == data.m_shortseq1.length (); - + if (good) { for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) @@ -298,12 +267,9 @@ Test_DynAny::run_test (void) ++this->error_count_; } - ACE_TRY_CHECK; - fa3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ftc3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa3->destroy (); + ftc3->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index 26f792b417c..e502bb36b6d 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -57,12 +57,10 @@ Test_DynArray::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -80,29 +78,22 @@ Test_DynArray::run_test (void) DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->insert_long (data.m_long1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + + fa1->rewind (); + CORBA::Long l_out1 = data.m_long2; fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + + l_out1 = fa1->get_long (); if (l_out1 == data.m_long1) { @@ -120,12 +111,10 @@ Test_DynArray::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynArray_var ftc1 = DynamicAny::DynArray::_narrow (ftc1_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) { @@ -141,14 +130,11 @@ Test_DynArray::run_test (void) ftc1->from_any (in_any2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->to_any (); DynAnyTests::test_array_forany ta_out; out_any1.in () >>= ta_out; @@ -174,11 +160,9 @@ Test_DynArray::run_test (void) as_in[1] = in_any3; ftc1->set_elements (as_in ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::AnySeq_var as_out = - ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_elements (); CORBA::Any out_any2 = as_out[1U]; CORBA::Long l_out2; out_any2 >>= l_out2; @@ -193,11 +177,9 @@ Test_DynArray::run_test (void) ++this->error_count_; } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); + + ftc1->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index 229e1460c24..f9da0a41706 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -49,12 +49,10 @@ Test_DynEnum::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -73,30 +71,23 @@ Test_DynEnum::run_test (void) DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynEnum_var de1 = DynamicAny::DynEnum::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); analyzer.analyze(dp1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_TRY_CHECK; de1->set_as_string ("TE_FIRST" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong ul_out1 = - de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + de1->get_as_ulong (); analyzer.analyze(de1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var out_any2 = - de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + de1->to_any (); if (ul_out1 == 1) { @@ -114,10 +105,8 @@ Test_DynEnum::run_test (void) de1->set_as_ulong (3 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var s = - de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + de1->get_as_string (); if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0) { @@ -136,12 +125,10 @@ Test_DynEnum::run_test (void) DynamicAny::DynAny_var de2_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynEnum_var de2 = DynamicAny::DynEnum::_narrow (de2_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (de2.in ())) { @@ -154,15 +141,12 @@ Test_DynEnum::run_test (void) in_any2 <<= DynAnyTests::TE_THIRD; de2->from_any (in_any2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze(de2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var out_any1 = - de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + de2->to_any (); + out_any1.in () >>= te; if (te == DynAnyTests::TE_THIRD) @@ -181,7 +165,6 @@ Test_DynEnum::run_test (void) CORBA::Boolean equal = de1->equal (de2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equal) { @@ -193,11 +176,9 @@ Test_DynEnum::run_test (void) ++this->error_count_; } - de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + de1->destroy (); + + de2->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index f9b79d7b952..80373bc717d 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -59,12 +59,10 @@ Test_DynSequence::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -88,14 +86,11 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var shortdany = dynany_factory->create_dyn_any (any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze(shortdany.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var any3; - any3 = shortdany->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + any3 = shortdany->to_any (); ts[0] = data.m_string2; ts[1] = data.m_string2; @@ -104,29 +99,22 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynSequence_var fa1 = DynamicAny::DynSequence::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->insert_string (data.m_string1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + + fa1->rewind (); + fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + CORBA::String_var out_str1 = - fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_string (); if (!ACE_OS::strcmp (out_str1.in (), data.m_string1)) { @@ -166,16 +154,13 @@ Test_DynSequence::run_test (void) 8); elements[i] = dynany_factory->create_dyn_any (elem_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } fa1->set_elements_as_dyn_any (elements.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnySeq_var out_elems = - fa1->get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_elements_as_dyn_any (); if (out_elems->length () != 3) { @@ -184,19 +169,16 @@ Test_DynSequence::run_test (void) } analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var out_str; for (i = 0; i < length; ++i) { - out_str = out_elems[i]->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + out_str = out_elems[i]->get_string (); CORBA::Boolean equal = out_elems[i]->equal (elements[i] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!equal) { @@ -205,8 +187,7 @@ Test_DynSequence::run_test (void) // To show that calling destroy() on a component does // nothing, as required by the spec. - out_elems[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + out_elems[i]->destroy (); } if (this->error_count_ == 0) @@ -223,12 +204,10 @@ Test_DynSequence::run_test (void) DynAnyTests::_tc_test_seq ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; DynamicAny::DynSequence_var ftc1 = DynamicAny::DynSequence::_narrow (ftc1_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) { @@ -242,15 +221,12 @@ Test_DynSequence::run_test (void) in_any2 <<= ts; ftc1->from_any (in_any2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->to_any (); + DynAnyTests::test_seq *ts_out; out_any1.in () >>= ts_out; @@ -267,8 +243,7 @@ Test_DynSequence::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: length/set_elements/get_elements\n")); - length = ftc1->get_length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + length = ftc1->get_length (); if (length != 2) { @@ -277,7 +252,6 @@ Test_DynSequence::run_test (void) ftc1->set_length (3 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::AnySeq as_in (3); as_in.length (3); CORBA::Any in_any3; @@ -288,12 +262,10 @@ Test_DynSequence::run_test (void) as_in[2] = in_any3; ftc1->set_elements (as_in ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::AnySeq_var as_out = - ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->get_elements (); + CORBA::ULong index = 2; CORBA::Any out_any2 = as_out[index]; char* out_str2; @@ -310,11 +282,9 @@ Test_DynSequence::run_test (void) "++ OK ++\n")); } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); + + ftc1->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 1281471c19e..2bb8ede9fb8 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -59,12 +59,10 @@ Test_DynStruct::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -82,70 +80,54 @@ Test_DynStruct::run_test (void) DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynStruct_var fa1 = DynamicAny::DynStruct::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->insert_char (data.m_char1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + + fa1->next (); + fa1->insert_short_seq (data.m_shortseq1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + + fa1->next (); DynamicAny::DynAny_var cc = - fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->current_component (); + cc->insert_float (data.m_float1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - cc->next (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + + cc->next (); + cc->insert_short (data.m_short1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - cc->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + cc->rewind (); // To show that calling destroy() on a component does // nothing, as required by the spec. - cc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + cc->destroy (); + + fa1->rewind (); - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Char c = fa1->get_char (); if (c != data.m_char1) { ++this->error_count_; } - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + fa1->next (); + data.m_shortseq2 = - fa1->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_short_seq (); bool good = data.m_shortseq2->length () == data.m_shortseq1.length (); - + if (good) { for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) @@ -162,17 +144,13 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->next (); + + cc = fa1->current_component (); - cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - cc->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Short s = cc->get_short (); if (s != data.m_short1) { @@ -193,12 +171,10 @@ Test_DynStruct::run_test (void) DynAnyTests::_tc_test_struct ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; DynamicAny::DynStruct_var ftc1 = DynamicAny::DynStruct::_narrow (ftc1_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) { @@ -215,14 +191,11 @@ Test_DynStruct::run_test (void) in_any2 <<= ts; ftc1->from_any (in_any2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->to_any (); DynAnyTests::test_struct* ts_out; out_any1.in () >>= ts_out; @@ -279,9 +252,8 @@ Test_DynStruct::run_test (void) // CORBA::Boolean status = ftc2->next (); // CORBA::Long lo = ftc2->get_long (); // analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER); -// ACE_TRY_CHECK; - out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + out_any2 = ftc2->to_any (); ACE_TRY_CHECK_EX (bad_kind); if (!(out_any2.in () >>= ts_out2)) // problem @@ -293,7 +265,6 @@ Test_DynStruct::run_test (void) { } ACE_ENDTRY; - ACE_TRY_CHECK; if (ts_out2 != 0 && ts_out2->es.s == data.m_short1) { @@ -310,11 +281,9 @@ Test_DynStruct::run_test (void) "testing: current_member_name/current_member_kind\n")); ftc1->seek (2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::FieldName_var fn = - ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->current_member_name (); if (ACE_OS::strcmp (fn.in (), "es")) { @@ -322,8 +291,7 @@ Test_DynStruct::run_test (void) } CORBA::TCKind tk = - ftc1->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->current_member_kind (); if (tk != CORBA::tk_struct) { @@ -341,11 +309,9 @@ Test_DynStruct::run_test (void) "with alias\n")); ftc2->seek (2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::FieldName_var fn2 = - ftc2->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc2->current_member_name (); if (ACE_OS::strcmp (fn2.in (), "es")) { @@ -353,8 +319,7 @@ Test_DynStruct::run_test (void) } CORBA::TCKind tk2 = - ftc2->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc2->current_member_kind (); if (tk2 != CORBA::tk_struct) { @@ -371,20 +336,17 @@ Test_DynStruct::run_test (void) "testing: get_members/set_members\n")); DynamicAny::NameValuePairSeq_var nvps = - fa1->get_members (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_members (); DynamicAny::DynAny_var sm_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_struct ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; DynamicAny::DynStruct_var sm = DynamicAny::DynStruct::_narrow (sm_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sm.in ())) { @@ -395,11 +357,9 @@ Test_DynStruct::run_test (void) sm->set_members (nvps.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::NameValuePairSeq_var gm = - sm->get_members (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sm->get_members (); CORBA::ULong index = 2; @@ -408,14 +368,11 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->destroy (); - sm->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sm->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index 269f161e974..3e260d464e2 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -53,12 +53,10 @@ Test_DynUnion::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) { @@ -80,22 +78,17 @@ Test_DynUnion::run_test (void) DynamicAny::DynAny_var dp4 = dynany_factory->create_dyn_any (in_any4 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynUnion_var fa4 = DynamicAny::DynUnion::_narrow (dp4.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; analyzer.analyze(fa4.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any5 = fa4->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any5 = fa4->to_any (); DynamicAny::DynAny_var dp5 = dynany_factory->create_dyn_any (out_any5.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/insert/get\n")); @@ -107,25 +100,19 @@ Test_DynUnion::run_test (void) DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynUnion_var fa1 = DynamicAny::DynUnion::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; fa1->insert_typecode (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TypeCode_var s_out1 = fa1->get_typecode (); CORBA::Boolean const equal_tc1 = s_out1->equal (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equal_tc1) { @@ -141,19 +128,15 @@ Test_DynUnion::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any1 = fa1->to_any (); DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynUnion_var ftc1 = DynamicAny::DynUnion::_narrow (ftc1_base.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) { @@ -164,19 +147,15 @@ Test_DynUnion::run_test (void) ftc1->from_any (out_any1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + CORBA::TypeCode_var s_out2 = - ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_typecode (); CORBA::Boolean const equal_tc2 = s_out2->equal (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equal_tc2) { @@ -192,10 +171,8 @@ Test_DynUnion::run_test (void) "testing: constructor(TypeCode alias)/from_any/to_any\n")); analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any2 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any2 = fa1->to_any (); CORBA::TypeCode_var s_out3; @@ -205,7 +182,7 @@ Test_DynUnion::run_test (void) dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - + DynamicAny::DynUnion_var ftc2 = DynamicAny::DynUnion::_narrow (ftc2_base.in () ACE_ENV_ARG_PARAMETER); @@ -221,11 +198,11 @@ Test_DynUnion::run_test (void) ftc2->from_any (out_any2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - + ftc2->seek (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - - s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); + + s_out3 = ftc2->get_typecode (); ACE_TRY_CHECK_EX (bad_kind); } ACE_CATCH (CORBA::TypeCode::BadKind, ex) @@ -233,14 +210,12 @@ Test_DynUnion::run_test (void) // Failed to create } ACE_ENDTRY; - ACE_TRY_CHECK; if (!CORBA::is_nil (s_out3.in ())) { CORBA::Boolean const equal_tc = s_out3->equal (data.m_typecode1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equal_tc) { @@ -261,19 +236,15 @@ Test_DynUnion::run_test (void) "testing:discriminator/discriminator_kind\n")); DynamicAny::DynAny_var dp2 = - ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_discriminator (); CORBA::TypeCode_var tc2 = - dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dp2->type (); CORBA::TCKind tc1kind = - ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->discriminator_kind (); + + CORBA::TCKind tc2kind = tc2->kind (); if (tc2kind == tc1kind) { @@ -289,25 +260,20 @@ Test_DynUnion::run_test (void) "testing:member/member_kind/member_name\n")); DynamicAny::DynAny_var dp3 = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member (); + CORBA::String_var m_nm = - ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member_name (); + CORBA::TCKind tk = - ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member_kind (); + CORBA::TypeCode_var tc3 = - dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dp3->get_typecode (); CORBA::Boolean const equal_tc3 = data.m_typecode1->equal (tc3.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!ACE_OS::strcmp (m_nm.in (), "tc") && tk == CORBA::tk_TypeCode @@ -320,29 +286,23 @@ Test_DynUnion::run_test (void) { ++this->error_count_; } - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "testing: set_to_default_member\n")); - ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->set_to_default_member (); + ftc1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->insert_short (data.m_short1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynAny_var mem = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member (); + CORBA::Short out_s = - mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mem->get_short (); if (out_s == data.m_short1) { @@ -354,11 +314,9 @@ Test_DynUnion::run_test (void) ++this->error_count_; } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); + + ftc1->destroy (); ACE_DEBUG ((LM_DEBUG, "testing: create_dyn_any with _default()\n")); @@ -366,14 +324,11 @@ Test_DynUnion::run_test (void) CORBA::Any any_union; test_implicit_def_union._default(); - ACE_TRY_CHECK; - + any_union <<= test_implicit_def_union; - ACE_TRY_CHECK; DynamicAny::DynAny_var da_union = dynany_factory->create_dyn_any (any_union); - ACE_TRY_CHECK; // if we get here the create_dyn_any worked. } diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp index 174fa2dc97c..7180eff3205 100644 --- a/TAO/tests/Explicit_Event_Loop/client.cpp +++ b/TAO/tests/Explicit_Event_Loop/client.cpp @@ -39,7 +39,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check arguments. if (argc != 2) @@ -52,7 +51,6 @@ main (int argc, char *argv[]) // Destringify argv[1]. CORBA::Object_var obj = orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) { @@ -64,7 +62,6 @@ main (int argc, char *argv[]) // Narrow. Time_var tm = Time::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (tm.in ())) { @@ -74,8 +71,7 @@ main (int argc, char *argv[]) } // Get time. - TimeOfDay tod = tm->get_gmt (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TimeOfDay tod = tm->get_gmt (); ACE_DEBUG ((LM_DEBUG, "%s%s%d:%s%d:%d\n", @@ -101,6 +97,5 @@ main (int argc, char *argv[]) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 498c465ec22..1f0dac851b3 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -93,7 +93,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) { @@ -104,31 +103,25 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Activate POA manager. PortableServer::POAManager_var mgr - = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = poa->the_POAManager (); - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr->activate (); // Create an object. Time_impl time_servant; // Write its stringified reference to stdout. - Time_var tm = time_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Time_var tm = time_servant._this (); CORBA::String_var str = orb->object_to_string (tm.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", @@ -159,13 +152,11 @@ main (int argc, char *argv[]) while (!done) { CORBA::Boolean pending = - orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->work_pending (); if (pending) { - orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->perform_work (); } do_something_else (); } diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h index e5c19b27546..4bf7d7c1b1f 100644 --- a/TAO/tests/Explicit_Event_Loop/server.h +++ b/TAO/tests/Explicit_Event_Loop/server.h @@ -26,7 +26,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual TimeOfDay get_gmt (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 4a707034563..1f2bd43626b 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -42,9 +42,8 @@ Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PAR } void -Counter_Servant::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Counter_Servant::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->policy_tester_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->policy_tester_->shutdown (); } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index 503d9cd3296..29e6e3e7334 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -35,16 +35,16 @@ public: // = Counter Interface Methods Overloading. - virtual void increment (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void increment (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long get_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void reset (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index 217eacdae41..906f21ae8a2 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -32,17 +32,14 @@ Policy_Tester::~Policy_Tester (void) } void -Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL) +Policy_Tester::run (void) { PortableServer::POAManager_var poa_manager = - this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->child_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->run (); } int @@ -54,17 +51,14 @@ Policy_Tester::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get a reference to the RT-ORB. CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Here we parse the command line paramether passed // to the application. @@ -79,13 +73,11 @@ Policy_Tester::init (int argc, { this->rt_poa_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) { @@ -95,7 +87,6 @@ Policy_Tester::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (-1); } this->rt_poa_properties_->ior_source (arg); } @@ -107,7 +98,6 @@ Policy_Tester::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (-1); } this->rt_object_properties_->ior_source (arg); } @@ -123,8 +113,7 @@ Policy_Tester::init (int argc, } int result = - this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_objects (); if (result != 0) return result; @@ -146,7 +135,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object, int -Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) +Policy_Tester::create_objects (void) { CORBA::PolicyList poa_policy_list; poa_policy_list.length (3); @@ -157,7 +146,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create priority Banded Connection Policy. RTCORBA::PriorityBands poa_priority_bands = @@ -166,7 +154,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) poa_policy_list[1] = this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Client Protocol Policy. RTCORBA::ProtocolList protocol_list; @@ -185,11 +172,9 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_mgr = PortableServer::POAManager::_nil (); @@ -199,18 +184,15 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) poa_mgr.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->child_poa_ = RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create a Corba Object reference, using the policies // set at the POA level. object = this->child_poa_->create_reference ("IDL:Counter:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reference Created!\n"))); @@ -220,7 +202,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) return -1; Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!check_reference (base_object.in(), "Unable to create a Object!\n")) @@ -228,7 +209,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) CORBA::String_var ior = this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), ior.in ())); @@ -254,7 +234,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) ("IDL:Counter:1.0", this->rt_object_properties_->priority () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reference Created!\n"))); @@ -264,7 +243,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) return -1; Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!check_reference (over_object.in(), "Unable to create Object!\n")) @@ -273,7 +251,6 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) CORBA::String_var o_ior = this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), o_ior.in ())); @@ -291,8 +268,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) } void -Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Policy_Tester::shutdown (void) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 970ed503b7f..8561406b5b5 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -35,17 +35,17 @@ public: Policy_Tester (void); ~Policy_Tester (void); - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); // Runs the test. int init (int argc, char *argv[] ACE_ENV_ARG_DECL); - void shutdown (ACE_ENV_SINGLE_ARG_DECL); + void shutdown (void); private: // Helper method used internally. - int create_objects (ACE_ENV_SINGLE_ARG_DECL); + int create_objects (void); CORBA::Boolean check_reference (CORBA::Object_ptr object, const char *msg); diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 4541f43613c..20a352ded22 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -24,7 +24,6 @@ Policy_Verifier::init (int argc, { this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); ACE_Arg_Shifter arg_shifter (argc, argv); @@ -36,7 +35,6 @@ Policy_Verifier::init (int argc, { this->rt_poa_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); } @@ -44,7 +42,6 @@ Policy_Verifier::init (int argc, { this->rt_object_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) { @@ -54,7 +51,6 @@ Policy_Verifier::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (false); } this->rt_poa_properties_->ior_source (arg); ACE_OS::strcpy (this->base_object_ref_, "file://"); @@ -69,7 +65,6 @@ Policy_Verifier::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (false); } this->rt_object_properties_->ior_source (arg); ACE_OS::strcpy (this->overridden_object_ref_, "file://"); @@ -92,26 +87,22 @@ Policy_Verifier::init (int argc, // Get the Object references. CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (this->base_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) return false; object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (this->overridden_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) @@ -126,12 +117,10 @@ Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL ) this->verify_reference (this->base_object_.in (), this->rt_poa_properties_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->verify_reference (this->overridden_object_.in (), this->rt_object_properties_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -145,7 +134,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, CORBA::Policy_var policy_var = object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n")) { @@ -153,12 +141,10 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ()); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->priority_model (); RTCORBA::Priority priority = - priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->server_priority (); if (priority_model == RTCORBA::SERVER_DECLARED) ACE_DEBUG ((LM_DEBUG, @@ -179,7 +165,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Banded Policy\n")) @@ -188,7 +173,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (priority_banded_policy.in (), @@ -225,18 +209,15 @@ Policy_Verifier::verify_reference (Counter_ptr object, } policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Client Protocol Policy\n")) { RTCORBA::ClientProtocolPolicy_var client_protocol_policy = RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocol_list = - client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client_protocol_policy->protocols (); for (unsigned int i = 0; i < protocol_list->length (); i++) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h index 8eeec72ae89..b78926c289f 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.h +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h @@ -44,7 +44,7 @@ public: char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void run (void); private: // -- Helper methods -- diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index 80bc23f24f3..aaefc20f658 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -22,12 +22,10 @@ main (int argc, char *argv[]) Policy_Verifier policy_verifier; bool retval = policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval) { - policy_verifier.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_verifier.run (); } else { diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index ecc7d20d022..6548d9ba6a8 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -28,13 +28,11 @@ main (int argc, char *argv[]) Policy_Tester policy_tester; int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - policy_tester.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_tester.run (); } ACE_CATCHANY diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 5e55fff3819..e236236fe5c 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -59,7 +59,6 @@ int main (int argc, char* argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Fl_Window window (300, 100); @@ -72,7 +71,6 @@ int main (int argc, char* argv[]) client.show (); client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Fl::run (); } @@ -140,7 +138,6 @@ Client::x_changed (void) { CORBA::Long x = CORBA::Long (this->x_roller_->value ()); this->server_->set_x_angle (x ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -156,7 +153,6 @@ Client::y_changed (void) { CORBA::Long y = CORBA::Long (this->y_roller_->value ()); this->server_->set_y_angle (y ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -191,9 +187,7 @@ Client::parse_args (int argc, char *argv[] CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->server_ = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index f3c3a235446..d0ae338f88d 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -52,7 +52,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -64,7 +63,6 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -73,21 +71,17 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Simple_Server_i server_impl (orb.in (), &sw); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -104,8 +98,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (Fl::run () == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1); diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index 55e557c3341..649dc7a0a6e 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -28,7 +28,7 @@ Simple_Server_i::set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index b2573fa173f..de8c1766c83 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -66,7 +66,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); void set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index d7f4cf4e6e0..f7d2b63c058 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -72,11 +72,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -85,25 +83,20 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -116,15 +109,13 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); Callback_var callback = - callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl._this (); for (int i = 0; i != niterations; ++i) { CORBA::Long r = server->test_method (0, 0, callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) { @@ -147,7 +138,6 @@ main (int argc, char *argv[]) // Expected exception, continue.... } ACE_ENDTRY; - ACE_TRY_CHECK; } else if (do_crash) { @@ -162,30 +152,25 @@ main (int argc, char *argv[]) // Expected exception, continue.... } ACE_ENDTRY; - ACE_TRY_CHECK; } else if (do_suicide) { (void) server->test_method (1, 0, callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n")); } else if (do_self_shutdown) { (void) server->test_method (1, 1, callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (do_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::COMM_FAILURE, x) diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 8791dfa0c45..0ae08ed9f8b 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -53,11 +53,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,25 +64,20 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -103,12 +96,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(middle_impl); Simple_Server_var middle = - middle_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + middle_impl->_this (); CORBA::String_var ior = orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -125,13 +116,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index d113c4a8a84..71d3c1899af 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -41,50 +41,38 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // create child poa with PERSISTENT policy - ACE_TRY_CHECK; CORBA::PolicyList policies; policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); + policies[1]->destroy (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -98,12 +86,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(server_impl); PingObject_var server = - server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -120,16 +106,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "ping - event loop finished\n")); persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index 1a521363671..c11f773b4d3 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -13,24 +13,24 @@ PingObject_i::ping (PingObject_ptr callback ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - callback->pong (ACE_ENV_SINGLE_ARG_PARAMETER); + callback->pong (); } void -PingObject_i::pong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +PingObject_i::pong (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -PingObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +PingObject_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -PingObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +PingObject_i::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 21fcda99ec6..43af7db0c98 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -37,12 +37,12 @@ public: void ping (PingObject_ptr callback ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void pong (ACE_ENV_SINGLE_ARG_DECL) + void pong (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index fbc0b86a42f..f530bfb57c2 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -70,11 +70,9 @@ run_client (CORBA::ORB_ptr orb, { reason = "Exception during ping call"; server->ping (callback ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Run for <period> milliseconds, to receive the reply orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Terminate the client if: // - This is the last iteration @@ -84,8 +82,7 @@ run_client (CORBA::ORB_ptr orb, { ACE_DEBUG ((LM_DEBUG, "Shutting down server\n")); reason = "Exception during server shutdown"; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCH (CORBA::TRANSIENT, t) @@ -117,60 +114,46 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // create child poa with PERSISTENT policy - ACE_TRY_CHECK; CORBA::PolicyList policies; policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); + policies[1]->destroy (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PingObject_var server = PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -184,8 +167,7 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var callback = - callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl._this (); // If the ior_output_file exists, output the ior to it @@ -193,13 +175,10 @@ main (int argc, char *argv[]) server.in (), callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index 530af043ca7..e1b1b1a5551 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,14 +52,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -77,12 +72,10 @@ main (int argc, char *argv[]) Simple_Server_var server = - server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -99,13 +92,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index 19e47d882dc..2d1a6d4b599 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -30,7 +30,6 @@ Callback_i::shutdown (CORBA::Boolean is_clean return; } this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Shutdown: Performed clean shutdown\n")); } @@ -49,7 +48,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n", is_clean)); callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); } ACE_Time_Value tv (0, 20000); ACE_OS::sleep (tv); @@ -77,7 +75,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -99,14 +97,12 @@ Middle_i::test_method (CORBA::Boolean do_callback, 0, callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); } this->server_->test_method (do_callback, is_clean, callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); for (; i != 10; ++i) { @@ -114,7 +110,6 @@ Middle_i::test_method (CORBA::Boolean do_callback, 0, callback ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); } return 0; @@ -129,13 +124,12 @@ Middle_i::shutdown_now (CORBA::Boolean is_clean } void -Middle_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Middle_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index 85cbb8c524d..15d669f6b35 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -65,7 +65,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -97,7 +97,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 2e74de2a9f9..82968309692 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -30,7 +30,6 @@ FileImpl::System::System (PortableServer::POA_ptr poa) ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } FileImpl::System::~System (void) @@ -38,7 +37,7 @@ FileImpl::System::~System (void) } PortableServer::POA_ptr -FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::System::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -77,13 +76,11 @@ FileImpl::System::open (const char *file_name, this->poa_->create_reference_with_id (oid.in (), "IDL:File/Descriptor:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (File::Descriptor::_nil ()); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (File::Descriptor::_nil ()); return fd._retn (); } @@ -99,27 +96,25 @@ FileImpl::Descriptor::~Descriptor (void) } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::Descriptor::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::fd (void) { // // One way of getting our id. // // Get a reference to myself - File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + File::Descriptor_var me = this->_this (); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // // Another way of getting our id. @@ -127,7 +122,6 @@ FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var oid2 = this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // // Yet another way of getting our id. @@ -135,23 +129,19 @@ FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the POA Current object reference CORBA::Object_var obj = orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); PortableServer::ObjectId_var oid3 = - poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + poa_current->get_object_id (); ACE_ASSERT (oid1.in () == oid2.in ()); ACE_ASSERT (oid2.in () == oid3.in ()); @@ -170,8 +160,7 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); const CORBA::Octet *data = &buffer[0]; @@ -190,8 +179,7 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes); ssize_t length = ACE_OS::read (file_descriptor, buffer, num_bytes); @@ -213,8 +201,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor, offset, @@ -226,12 +213,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_HANDLE file_descriptor = this->fd (); // Close the file corresponding to this object reference. ACE_OS::close (file_descriptor); diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index ebe06fce403..c77d5cdd66f 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/File_i.h @@ -34,7 +34,7 @@ public: ~Descriptor (void); // Destructor - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); // Returns the default POA of this object virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer @@ -56,13 +56,13 @@ public: File::IOError)); // seek to the offset in file from whence - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); // closes the file corresponding to the requested ObjectID private: - ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL); + ACE_HANDLE fd (void); // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; @@ -80,7 +80,7 @@ public: ~System (void); //Destructor - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 189a81e3d59..e27d088db8c 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -90,8 +90,7 @@ validate_connection (CORBA::Object_ptr object { ACE_TRY { - object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + object->_non_existent (); } ACE_CATCH (CORBA::TRANSIENT, exception) { @@ -103,7 +102,6 @@ validate_connection (CORBA::Object_ptr object ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -117,22 +115,18 @@ MTTEST (void *args) { CORBA::Object_var object = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; validate_connection (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference to a File::System File::System_var file_system = File::System::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creat the file filename i.e "test" File::Descriptor_var fd = file_system->open (filename, O_RDONLY ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for( int i = 0; i < iterations; ++i) { @@ -142,18 +136,15 @@ MTTEST (void *args) #endif /*if 0*/ fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Read back the written message // Twice the size of the socket buffer File::Descriptor::DataBuffer_var data_received = fd->read (128*1024 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // close the file - fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fd->destroy (); } ACE_CATCHANY { @@ -174,7 +165,6 @@ main (int argc, char **argv) { // Initialize the ORB orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR parse_args (argc, argv); @@ -218,7 +208,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 7d73730e5dc..e3f281db114 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -84,7 +84,6 @@ main (int argc, char *argv[]) { // Initialize the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); if (result != 0) @@ -94,16 +93,13 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference to a POA reference PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies (5); policies.length (5); @@ -111,27 +107,22 @@ main (int argc, char *argv[]) // ID Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Servant Retention Policy policies[3] = root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_CString name = "firstPOA"; PortableServer::POA_var first_poa = @@ -139,15 +130,13 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); } // Create a File System Implementation object in first_poa @@ -159,16 +148,13 @@ main (int argc, char *argv[]) first_poa->activate_object_with_id (file_system_oid.in (), &file_system_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var file_system = first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the IOR for the "FileSystem" object CORBA::String_var file_system_ior = orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", file_system_ior.in ())); @@ -184,8 +170,7 @@ main (int argc, char *argv[]) // set the state of the poa_manager to active i.e ready to // process requests - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Worker worker (orb.in ()); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, @@ -197,13 +182,10 @@ main (int argc, char *argv[]) worker.thr_mgr ()->wait (); first_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy(); } ACE_CATCHANY { @@ -211,7 +193,6 @@ main (int argc, char *argv[]) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -233,7 +214,6 @@ Worker::svc (void) // Run the ORB for atmost 75 seconds ACE_Time_Value tv (75, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -241,7 +221,6 @@ Worker::svc (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 7d6eee99bb3..ae132dd5249 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -52,7 +52,7 @@ public: Worker (CORBA::ORB_ptr orb); // Constructor - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL); + virtual void run_test (void); // The actual implementation of the test // = The Task_Base methods @@ -70,7 +70,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -86,12 +85,10 @@ main (int argc, char *argv[]) ACE_Time_Value tv (5, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now run a test in the main thread, just to confuse matters a // little more. - worker.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + worker.run_test (); worker.thr_mgr ()->wait (); @@ -99,18 +96,14 @@ main (int argc, char *argv[]) { CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -135,8 +128,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run_test (); } ACE_CATCHANY { @@ -149,17 +141,15 @@ Worker::svc (void) } void -Worker::run_test (ACE_ENV_SINGLE_ARG_DECL) +Worker::run_test (void) { for (int j = 0; j != niterations; ++j) { CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Boolean is_simple_server = object->_is_a ("IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!is_simple_server) ACE_DEBUG ((LM_DEBUG, "(%P|%t) unexpected result from _is_a()\n")); @@ -167,11 +157,9 @@ Worker::run_test (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (server.in ())) { @@ -185,7 +173,6 @@ Worker::run_test (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean r = server->test_is_a ("IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (r != 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index 788a56c975a..291eb881825 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -42,23 +42,19 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -66,26 +62,21 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var table_object = orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var table = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (table.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the IORTable.\n"), 1); table->bind ("Simple_Server", ior.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -98,11 +89,9 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index cccce97d7df..07410e40dbd 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -18,7 +18,7 @@ Simple_Server_i::test_is_a (const char * /* type */ } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h index 6f61069a79b..f47f46095b3 100644 --- a/TAO/tests/Forwarding/test_i.h +++ b/TAO/tests/Forwarding/test_i.h @@ -34,7 +34,7 @@ public: CORBA::Boolean test_is_a (const char * type ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp index a6a92dab129..73f2c212aef 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp @@ -29,8 +29,7 @@ Client_Task::svc (void) for (int i = 0; i != this->event_count_; ++i) { Test::Octet_Seq_var seq = - this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->reply_gen_->get_big_reply (); CORBA::ULong length = seq->length (); for(CORBA::ULong i = 0; i < length; ++i) diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp index e900b46cdc1..85ae17ba6b1 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp @@ -44,18 +44,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Big_Reply_var reply_gen = Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (reply_gen.in ())) { @@ -77,11 +74,9 @@ main (int argc, char *argv[]) } ACE_Thread_Manager::instance ()->wait (); - reply_gen->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + reply_gen->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp index 3e0c7b01499..58e009fa9c2 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -31,7 +31,7 @@ Payload_Receiver::more_data (const Test::Payload &payload void -Payload_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Payload_Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h index 418f80cbffa..d8e18b0686c 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -25,7 +25,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); int get_count (void) const; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index cbe3a65d928..78d90dd7758 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,11 +52,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); Test::Payload_Receiver_var payload_receiver = - payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + payload_receiver_impl->_this (); CORBA::String_var ior = orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,11 +81,9 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); if (payload_receiver_impl->get_count () != 20) { @@ -103,10 +95,8 @@ main (int argc, char *argv[]) } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp index 8dd53b815ec..98efb9987b6 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -31,7 +31,7 @@ Payload_Receiver::more_data (const Test::Payload &payload void -Payload_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Payload_Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h index b9ced6d7672..36a6e98a37c 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -25,7 +25,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); int get_count (void) const; diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index 166b514f35c..7a6aa3e16ad 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,11 +52,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,16 +80,13 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = persistent_poa->activate_object (payload_receiver_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = persistent_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -105,11 +98,9 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); if (payload_receiver_impl->get_count () != 2) { @@ -121,10 +112,8 @@ main (int argc, char *argv[]) } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index 066461f895a..bd8775dd4c4 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -70,17 +70,14 @@ namespace Test this->h_->send_stuff ("Testing", false ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->h_->send_stuff ("Testing", false ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->h_->send_stuff ("Testing", true ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::COMM_FAILURE, f) { @@ -145,7 +142,6 @@ namespace Test this->o_->shutdown (blocked ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Stop the timer profile_timer.stop (); @@ -194,7 +190,6 @@ namespace Test argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) == false) return -1; @@ -202,12 +197,10 @@ namespace Test CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Hang_var test = Hang::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -236,8 +229,7 @@ namespace Test ACE_Thread_Manager::instance ()->wait (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 4f17562b879..259e33b46c6 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -21,17 +21,14 @@ namespace Test argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -39,8 +36,7 @@ namespace Test 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); test_i *test_impl; ACE_NEW_RETURN (test_impl, @@ -49,13 +45,11 @@ namespace Test PortableServer::ServantBase_var owner_transfer (test_impl); Hang_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -67,8 +61,7 @@ namespace Test ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Time_Value tv (10); @@ -80,10 +73,8 @@ namespace Test root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp index f85722246b5..e4569d3dcce 100644 --- a/TAO/tests/Hello/client.cpp +++ b/TAO/tests/Hello/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -62,17 +59,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index 3b309f50f0d..5ec046e3b26 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index bfa97ea05a1..17ab0efef4f 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -13,28 +13,25 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) } Test::HelloWorld_ptr -Hello::get_helloworld (ACE_ENV_SINGLE_ARG_DECL) +Hello::get_helloworld (void) ACE_THROW_SPEC ((CORBA::SystemException)) { HelloWorld *hello_world; ACE_NEW_THROW_EX (hello_world, HelloWorld, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::HelloWorld::_nil ()); PortableServer::ObjectId_var oid = poa_->activate_object (hello_world ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Test::HelloWorld::_nil ()); Test::HelloWorld_var hw = hello_world->_this (); return hw._retn (); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index 429a7e10963..c7fe9919faf 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h @@ -19,10 +19,10 @@ public: /// Constructor Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - virtual Test::HelloWorld_ptr get_helloworld (ACE_ENV_SINGLE_ARG_DECL) + virtual Test::HelloWorld_ptr get_helloworld (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp index e4badcc805c..2c5653bbfdb 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp @@ -13,7 +13,7 @@ HelloWorld::HelloWorld (void) } char * -HelloWorld::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +HelloWorld::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO Any Implementation Works!"); diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index ad60160af2d..85c9da63242 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h @@ -18,7 +18,7 @@ public: HelloWorld (void); /// Constructor - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index 3457c09156a..a38f0f1831e 100644 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp @@ -45,18 +45,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -73,8 +70,7 @@ main (int argc, char *argv[]) any <<= "Hi From DOC Group"; request->arguments ()->add_value ("msg", any, CORBA::ARG_IN); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + request->invoke (); CORBA::NamedValue_ptr results = request->result (); CORBA::Any * obj_any = results->value (); @@ -90,7 +86,6 @@ main (int argc, char *argv[]) Test::HelloWorld_var hello_world = Test::HelloWorld::_narrow (obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello_world.in ())) { @@ -100,17 +95,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello_world->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_world->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index e32f495349a..7d00b4cfde7 100644 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index 2c39344eabf..ce86ec57594 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -95,25 +95,21 @@ main (int argc , char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test of #pragma prefix behavior. CORBA::Object_var obj; hello_i h; - obj = h._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = h._this (); if (ACE_OS::strcmp (obj->_interface_repository_id (), "IDL:anvil.com/hello:1.0")) @@ -124,8 +120,7 @@ main (int argc , char *argv[]) } goodbye_i g; - obj = g._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = g._this (); if (ACE_OS::strcmp (obj->_interface_repository_id (), "IDL:anvil.com/goodbye:1.0")) @@ -136,8 +131,7 @@ main (int argc , char *argv[]) } sayonara_i s; - obj = s._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = s._this (); if (ACE_OS::strcmp (obj->_interface_repository_id (), "IDL:hammer.com/salutation/sayonara:1.0")) @@ -148,8 +142,7 @@ main (int argc , char *argv[]) } ciao_i c; - obj = c._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = c._this (); if (ACE_OS::strcmp (obj->_interface_repository_id (), "IDL:anvil.com/ciao:1.0")) @@ -160,8 +153,7 @@ main (int argc , char *argv[]) } aloha_i a; - obj = a._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = a._this (); if (ACE_OS::strcmp (obj->_interface_repository_id (), "IDL:anvil.com/aloha:1.0")) @@ -355,7 +347,6 @@ main (int argc , char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 29313aad9b1..875847f0afa 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -41,7 +41,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** @@ -49,12 +48,10 @@ main (int argc, char *argv[]) CORBA::Object_var IORM = orb_->resolve_initial_references ("IORManipulation" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_var iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** @@ -62,22 +59,18 @@ main (int argc, char *argv[]) CORBA::Object_var name1 = orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var name2 = orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** CORBA::String_var name1_ior = orb_->object_to_string (name1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.in ())); CORBA::String_var name2_ior = orb_->object_to_string (name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ())); // ********************************************************************** @@ -89,21 +82,16 @@ main (int argc, char *argv[]) iors [1] = name2; CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var merged_ior = orb_->object_to_string (merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong count1 = iorm->get_profile_count (iors [0] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong count2 = iorm->get_profile_count (iors [1] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong count = iorm->get_profile_count (merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count != (count1 + count2)) ACE_DEBUG ((LM_ERROR, @@ -119,7 +107,6 @@ main (int argc, char *argv[]) CORBA::ULong in_count = iorm->is_in_ior (merged.in (), name1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -130,7 +117,6 @@ main (int argc, char *argv[]) in_count = iorm->is_in_ior (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -144,14 +130,11 @@ main (int argc, char *argv[]) // First remove the second IOR from the merged IOR CORBA::Object_var just1 = iorm->remove_profiles (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var just1_ior = orb_->object_to_string (just1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; count = iorm->get_profile_count (just1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count1 != count) ACE_DEBUG ((LM_ERROR, @@ -164,7 +147,6 @@ main (int argc, char *argv[]) just1_ior.in ())); in_count = iorm->is_in_ior (just1.in (), name1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -177,10 +159,8 @@ main (int argc, char *argv[]) // Now try the add_profiles interface. CORBA::Object_var merged2 = iorm->add_profiles (just1.in (), name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; count = iorm->get_profile_count (merged2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count != (count1 + count2)) ACE_DEBUG ((LM_ERROR, @@ -188,7 +168,6 @@ main (int argc, char *argv[]) CORBA::String_var merged2_ior = orb_->object_to_string (merged2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\tAdding 2 back in IOR(%d) = %s\n", @@ -198,7 +177,6 @@ main (int argc, char *argv[]) // is_in_ior throws an exception if the intersection of the two // IORs is NULL. in_count = iorm->is_in_ior (merged2.in (), name1. in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -207,7 +185,6 @@ main (int argc, char *argv[]) in_count)); in_count = iorm->is_in_ior (merged2.in (), name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -218,14 +195,11 @@ main (int argc, char *argv[]) CORBA::Object_var just2 = iorm->remove_profiles (merged2.in (), name1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var just2_ior = orb_->object_to_string (just2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; count = iorm->get_profile_count (just2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count2 != count) ACE_DEBUG ((LM_ERROR, @@ -236,7 +210,6 @@ main (int argc, char *argv[]) just2_ior.in ())); in_count = iorm->is_in_ior (just2.in (), name2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -249,7 +222,6 @@ main (int argc, char *argv[]) // Finally generate an exception and quit. // This will generate a NotFound exception. in_count = iorm->is_in_ior (just2.in (), name1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (TAO_IOP::EmptyProfileList, userex) diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp index 7e876ea57c8..e9694858821 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp @@ -13,7 +13,7 @@ bogus::~bogus() } void -bogus::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +bogus::noop (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h index 94a4961f8ff..dceebf65eb0 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h @@ -15,7 +15,7 @@ public: bogus (); virtual ~bogus (); - virtual void noop (ACE_ENV_SINGLE_ARG_DECL) + virtual void noop (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp index b4058e4deef..1acd35bbb9e 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp @@ -17,28 +17,23 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var rp = PortableServer::POA::_narrow(poa_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (rp.in())) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) panic: nil root poa\n"), 1); bogus* bogus_impl = new bogus(); PortableServer::ServantBase_var owner_transfer(bogus_impl); - Test::bogus_var b = bogus_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::bogus_var b = bogus_impl->_this(); CORBA::String_var ior = orb->object_to_string (b.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; printf ("%s\n", ior.in()); - + orb->shutdown(); orb->destroy(); } diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/IPV6/Hello.cpp +++ b/TAO/tests/IPV6/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/IPV6/Hello.h +++ b/TAO/tests/IPV6/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp index 77a6ec4190b..aed3c55b373 100644 --- a/TAO/tests/IPV6/client.cpp +++ b/TAO/tests/IPV6/client.cpp @@ -47,18 +47,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -69,17 +66,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index 177aad4d1d8..245c288e5c8 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp index a3c0b51e25a..a702a184f19 100644 --- a/TAO/tests/InterOp-Naming/INS_i.cpp +++ b/TAO/tests/InterOp-Naming/INS_i.cpp @@ -24,7 +24,7 @@ INS_i::orb (CORBA::ORB_ptr o) } char * -INS_i::test_ins (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +INS_i::test_ins (void) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index 38687ea246c..28bfc384429 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -33,7 +33,7 @@ public: ~INS_i (void); // Destructor. - char * test_ins (ACE_ENV_SINGLE_ARG_DECL) + char * test_ins (void) ACE_THROW_SPEC (( CORBA::SystemException )); // test the INS. diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 0e4ac57360f..939d8a94ccc 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -21,7 +21,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (argc < 2) { @@ -38,8 +37,7 @@ main (int argc, char *argv[]) { // List initial services CORBA::ORB::ObjectIdList_var list = - orb->list_initial_services (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->list_initial_services (); size_t length = list->length (); @@ -70,7 +68,6 @@ main (int argc, char *argv[]) else { objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (objref.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,7 +77,6 @@ main (int argc, char *argv[]) INS_var server = INS::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var iorstr = orb->object_to_string (server.in ()); @@ -90,8 +86,7 @@ main (int argc, char *argv[]) iorstr.in())); CORBA::String_var test_ins_result = - server->test_ins (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_ins (); ACE_DEBUG ((LM_DEBUG, "\nResult of Remote Call : %s\n", @@ -109,7 +104,6 @@ main (int argc, char *argv[]) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp index c45f732a26f..c01a35c05f7 100644 --- a/TAO/tests/InterOp-Naming/INS_test_server.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp @@ -21,8 +21,7 @@ main (int argc, char *argv[]) return 1; else { - server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index ec60caff7ea..895a5905a55 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -80,14 +80,11 @@ Server_i::add_IOR_to_table (CORBA::String_var ior) this->orb_manager_.orb ()->resolve_initial_references ( "IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, ex) { @@ -110,7 +107,6 @@ Server_i::init (int argc, argv, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -137,7 +133,6 @@ Server_i::init (int argc, this->orb_manager_.activate_under_child_poa ("INS_servant", &this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", @@ -169,11 +164,10 @@ Server_i::init (int argc, } int -Server_i::run (ACE_ENV_SINGLE_ARG_DECL) +Server_i::run (void) { // Run the main event loop for the ORB. - int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int result = this->orb_manager_.run (); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index 7df2f070c41..b0f8311a91d 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -44,7 +44,7 @@ public: int add_IOR_to_table (CORBA::String_var ior); // Add an IOR to the ORB-IOR table. - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb. protected: diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 1711b12b175..99d64446409 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -137,7 +137,6 @@ public: CORBA::ULong result = this->test_->method (work_from_this_thread ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (work_from_this_thread != result) { @@ -156,7 +155,6 @@ public: } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -207,7 +205,6 @@ public: event_loop_timeout_for_this_thread * 1000); this->orb_->run (timeout ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n")); } @@ -219,7 +216,6 @@ public: } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -248,7 +244,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -258,12 +253,10 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. test_var server = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (server.in ()); @@ -293,8 +286,7 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCHANY @@ -305,7 +297,6 @@ main (int argc, char **argv) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 42575677363..1457d869a3c 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -58,8 +58,7 @@ public: ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -69,7 +68,6 @@ public: } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -89,24 +87,19 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return -1; @@ -114,13 +107,11 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -148,7 +139,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index 38f3459b07a..e67c5e68023 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -11,7 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h index b884d8b517f..e2f04aeb71d 100644 --- a/TAO/tests/Leader_Followers/test_i.h +++ b/TAO/tests/Leader_Followers/test_i.h @@ -29,7 +29,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 01b2d58bb9e..2ef6f261718 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -20,11 +20,9 @@ validate_connection (Test::Controller_ptr controller CORBA::PolicyList_var unused; controller->_validate_connection (unused ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #else controller->_is_a ("Not_an_IDL_Type" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif } ACE_CATCHANY @@ -49,7 +47,6 @@ AMI_Manager::start_workers (CORBA::Short worker_count, validate_connection(controller ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count)); Worker worker (&thread_manager, @@ -62,7 +59,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count, } void -AMI_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) +AMI_Manager::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -100,17 +97,14 @@ Worker::svc (void) -1); PortableServer::ServantBase_var auto_destroy (handler_impl); - handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler = handler_impl->_this (); } validate_connection(this->controller_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->controller_->sendc_worker_started (handler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); @@ -119,7 +113,6 @@ Worker::svc (void) this->controller_->sendc_worker_finished (handler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); @@ -127,7 +120,6 @@ Worker::svc (void) { ACE_Time_Value tv (0, 1000 * this->milliseconds_); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); if (pending_requests == 0) @@ -153,7 +145,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, } void -Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -168,8 +160,7 @@ Controller_Handler::worker_started_excep { ACE_TRY { - h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->raise_exception (); } ACE_CATCHANY { @@ -181,7 +172,7 @@ Controller_Handler::worker_started_excep } void -Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -196,8 +187,7 @@ Controller_Handler::worker_finished_excep { ACE_TRY { - h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->raise_exception (); } ACE_CATCHANY { diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 5d7d6a82eec..36236d5b35b 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -19,7 +19,7 @@ public: Test::Controller_ptr controller ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -61,12 +61,12 @@ public: int *pending_replies); // Constructor - virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL) + virtual void worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void worker_started_excep (::Messaging::ExceptionHolder* ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL) + virtual void worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void worker_finished_excep (::Messaging::ExceptionHolder* ACE_ENV_ARG_DECL) diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index 94008f0a364..69aebe53e9e 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -24,7 +24,7 @@ Controller::dump_results () } void -Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller::worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -34,7 +34,7 @@ Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Controller::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller::worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index a3992eb5c59..ac3238e99db 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -16,9 +16,9 @@ public: // Print out the results and any errors // = The skeleton methods - virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL) + virtual void worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL) + virtual void worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index 562ff8f262c..3cb9d08d740 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -20,11 +20,9 @@ validate_connection (Test::Controller_ptr controller CORBA::PolicyList_var unused; controller->_validate_connection (unused ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #else controller->_is_a ("Not_an_IDL_Type" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif } ACE_CATCHANY @@ -49,7 +47,6 @@ Manager::start_workers (CORBA::Short worker_count, validate_connection(controller ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count)); Worker worker (&thread_manager, @@ -61,7 +58,7 @@ Manager::start_workers (CORBA::Short worker_count, } void -Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Manager::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -88,18 +85,15 @@ Worker::svc (void) { validate_connection(this->controller_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->controller_->worker_started (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->controller_->worker_started (); // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); ACE_Time_Value tv (0, 1000 * this->milliseconds_); ACE_OS::sleep (tv); - this->controller_->worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->controller_->worker_finished (); // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); } diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 65e7934f00c..78c75c5b519 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -21,7 +21,7 @@ public: Test::Controller_ptr controller ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp index c1532a2eb86..a005874b6ee 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.cpp +++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp @@ -14,7 +14,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager, } void -Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL) +Manager_Handler::start_workers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -23,7 +23,6 @@ Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL) CORBA::Long(1000), this->controller_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -40,8 +39,7 @@ Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder { ACE_TRY { - holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + holder->raise_exception (); } ACE_CATCHANY { diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index 8ee1d472c2e..9dbc6426118 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -17,7 +17,7 @@ public: // Constructor // = The skeleton methods - virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL) + virtual void start_workers (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void start_workers_excep (::Messaging::ExceptionHolder *holder ACE_ENV_ARG_DECL) diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index e22153a203d..790594ef9be 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -65,15 +61,12 @@ main (int argc, char *argv[]) Controller controller_impl; Test::Controller_var controller = - controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + controller_impl._this (); object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Manager_var manager = Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,11 +76,9 @@ main (int argc, char *argv[]) Manager_Handler handler_impl (manager.in (), controller.in ()); Test::AMI_ManagerHandler_var handler = - handler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler_impl._this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); const CORBA::Short worker_count = 10; manager->sendc_start_workers (handler.in (), @@ -95,22 +86,17 @@ main (int argc, char *argv[]) CORBA::Long (1000), controller.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value tv (30, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; controller_impl.dump_results (); - manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index ed7307129f9..749ec6befa5 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -39,11 +39,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,11 +50,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -64,12 +60,10 @@ main (int argc, char *argv[]) AMI_Manager manager_impl (orb.in ()); Test::Manager_var manager = - manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager_impl._this (); CORBA::String_var ior = orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,19 +75,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index b914c957950..a63580bb2a8 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -39,11 +39,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,11 +50,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -64,15 +60,12 @@ main (int argc, char *argv[]) Controller controller_impl; Test::Controller_var controller = - controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + controller_impl._this (); object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Manager_var manager = Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,26 +73,21 @@ main (int argc, char *argv[]) 1); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); const CORBA::Short worker_count = 10; manager->start_workers (worker_count, CORBA::Long (1000), controller.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; controller_impl.dump_results (); - manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index eb5c55c3bf0..7abf137233f 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -39,11 +39,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,11 +50,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -64,12 +60,10 @@ main (int argc, char *argv[]) Manager manager_impl (orb.in ()); Test::Manager_var manager = - manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager_impl._this (); CORBA::String_var ior = orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,19 +75,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index b25b828894c..ad38e154796 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -61,7 +61,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -69,23 +68,19 @@ main (int argc, char *argv[]) // Primary server CORBA::Object_var object_primary = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; //Secondary server CORBA::Object_var object_secondary = orb->string_to_object (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get an object reference for the ORBs IORManipultion object! CORBA::Object_ptr IORM = orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_ptr iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); @@ -93,12 +88,10 @@ main (int argc, char *argv[]) iors [1] = object_secondary; CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -109,7 +102,6 @@ main (int argc, char *argv[]) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -129,8 +121,7 @@ void run_test (Simple_Server_ptr server { // Make a remote call CORBA::Long ret = - server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->remote_call (); ACE_UNUSED_ARG (ret); @@ -164,6 +155,5 @@ void run_test (Simple_Server_ptr server ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index 12aea589a09..e295abdc30a 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,15 +52,12 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +65,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -93,13 +86,11 @@ main (int argc, char *argv[]) } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_OS::sleep (5); } diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index 8135b51217d..76f835f9cf5 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void) } CORBA::Long -Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -28,7 +28,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index f6d4df6ebee..28eb022126c 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Long remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index 5425b2e0ddd..8e3a5b40b2d 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -66,7 +66,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -74,23 +73,19 @@ main (int argc, char *argv[]) // Primary server CORBA::Object_var object_primary = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; //Secondary server CORBA::Object_var object_secondary = orb->string_to_object (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get an object reference for the ORBs IORManipultion object! CORBA::Object_ptr IORM = orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_ptr iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); @@ -98,15 +93,12 @@ main (int argc, char *argv[]) iors [1] = object_secondary; CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any timeout_as_any; @@ -119,27 +111,23 @@ main (int argc, char *argv[]) orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE, timeout_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong l = 0; l != policy_list.length (); ++l) { - policy_list[l]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[l]->destroy (); } // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -151,7 +139,6 @@ main (int argc, char *argv[]) CORBA::ULongLong freq = run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (freq != 919263) ACE_ERROR ((LM_ERROR, @@ -161,8 +148,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Shutting server down \n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -178,5 +164,5 @@ CORBA::ULongLong run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL) { - return server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); + return server->remote_call (); } diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp index 9daac4d75f7..68d4fe10942 100644 --- a/TAO/tests/MProfile_Connection_Timeout/server.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp @@ -45,11 +45,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,15 +56,12 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -74,12 +69,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -100,14 +93,12 @@ main (int argc, char *argv[]) // RUn the event loop if needed if (orb_run) { - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index a2fccc999ef..39960fc15f9 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -24,7 +24,7 @@ Simple_Server_i::Simple_Server_i (void) } CORBA::ULongLong -Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -35,7 +35,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h index b9ce049710b..733094afd73 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.h +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::ULongLong remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::ULongLong remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index 7336bc42523..07a9376ceeb 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -63,19 +63,15 @@ main (int argc, manager.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) return -1; - manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager.activate_servant (); - manager.make_iors_register (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager.make_iors_register (); - manager.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager.run (); } ACE_CATCHANY { @@ -104,25 +100,20 @@ Manager::init (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Obtain the RootPOA. CORBA::Object_var obj_var = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = - root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + root_poa_var->the_POAManager (); - poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager_var->activate (); // Policies for the childPOA to be created. CORBA::PolicyList policies (4); @@ -133,25 +124,21 @@ Manager::init (int argc, policies[0] = root_poa_var->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Lifespan policy policies[1] = root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Tell the POA to use a servant manager policies[2] = root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Servant Retention Policy -> Use a locator policies[3] = root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_CString name = "newPOA"; @@ -160,7 +147,6 @@ Manager::init (int argc, poa_manager_var.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Creation of childPOAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -168,8 +154,7 @@ Manager::init (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policy->destroy (); } return 0; @@ -177,13 +162,12 @@ Manager::init (int argc, int -Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL) +Manager::activate_servant (void) { ACE_NEW_THROW_EX (this->servant_locator_, Servant_Locator (this->orb_.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (-1); this->servant_locator_var_ = this->servant_locator_; @@ -191,7 +175,6 @@ Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL) // secondPOA. this->new_poa_var_->set_servant_manager (this->servant_locator_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Try to create a reference with user created ID in new_poa // which uses ServantLocator. @@ -202,26 +185,23 @@ Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL) this->new_manager_ior_ = new_poa_var_->create_reference_with_id (second_foo_oid_var.in (), "IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } int -Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) +Manager::make_iors_register (void) { // First server CORBA::Object_var object_primary = this->orb_->string_to_object (first_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); //Second server CORBA::Object_var object_secondary = this->orb_->string_to_object (second_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (third_ior == 0) ACE_DEBUG ((LM_DEBUG, @@ -230,18 +210,15 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object_tertiary = this->orb_->string_to_object (third_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get an object reference for the ORBs IORManipultion object! CORBA::Object_ptr IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_IOP::TAO_IOR_Manipulation_ptr iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the list @@ -254,7 +231,6 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) // Create a merged set 1; CORBA::Object_var merged_set1 = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (object_secondary.in () == 0) ACE_DEBUG ((LM_DEBUG, @@ -273,7 +249,6 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) // Create merged set 2 CORBA::Object_var merged_set2 = iorm->merge_iors (iors_again ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::String_var iorref1 = this->orb_->object_to_string (merged_set1.in ()); @@ -297,10 +272,9 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) int -Manager::run (ACE_ENV_SINGLE_ARG_DECL) +Manager::run (void) { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_->run (); return 0; } diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h index 6f14588b3a3..f84401427cf 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.h +++ b/TAO/tests/MProfile_Forwarding/Manager.h @@ -18,15 +18,15 @@ class Manager // Initialize the ORB, POA etc. - int init_register_name_service (ACE_ENV_SINGLE_ARG_DECL); + int init_register_name_service (void); // Initialize the Name service, tegister the combined IOR with it - int activate_servant (ACE_ENV_SINGLE_ARG_DECL); + int activate_servant (void); // Activate the servant etc. - int make_iors_register (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int make_iors_register (void); - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the ORB event loop.. private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index fc690fa5cf4..c3ed9260942 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -62,7 +62,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, Simple_Server_var server = Simple_Server::_narrow (this->objref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "Got the narrowed secondary server too... \n")); diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index 610899838a9..b8a4919b495 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -47,14 +47,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) return -1; CORBA::Object_var objref = orb->string_to_object (ior_input_file); - ACE_TRY_CHECK; if (objref.in () == 0) { @@ -65,7 +63,6 @@ main (int argc, char *argv[]) Simple_Server_var server = Simple_Server::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -75,7 +72,6 @@ main (int argc, char *argv[]) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -98,8 +94,7 @@ void run_test (Simple_Server_ptr server ACE_OS::sleep (2); // Make a remote call - server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->remote_call (); /*ACE_DEBUG ((LM_DEBUG, "Kill the primary . . . ")); @@ -107,8 +102,7 @@ void run_test (Simple_Server_ptr server ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */ ACE_DEBUG ((LM_DEBUG, "I am going to shutdown \n")); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_OS::sleep (23); } ACE_CATCH (CORBA::UserException, x) @@ -132,6 +126,5 @@ void run_test (Simple_Server_ptr server ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 04c27ae739f..b973dc29da8 100644 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,15 +52,12 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +65,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -93,13 +86,11 @@ main (int argc, char *argv[]) } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_OS::sleep (5); } diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index a3f647d2cb3..1ef2fd374ec 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -15,7 +15,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -24,7 +24,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index 59156bee2ba..5568f94a471 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp index 58b598b90e1..8564f9d98ef 100644 --- a/TAO/tests/MT_BiDir/Client_Task.cpp +++ b/TAO/tests/MT_BiDir/Client_Task.cpp @@ -25,7 +25,6 @@ Client_Task::svc (void) ACE_TRY { this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp index 780f39d18ad..c27adf89fe6 100644 --- a/TAO/tests/MT_BiDir/Sender_i.cpp +++ b/TAO/tests/MT_BiDir/Sender_i.cpp @@ -57,7 +57,7 @@ Sender_i::receiver_object (Receiver_ptr recv void -Sender_i::send_message (ACE_ENV_SINGLE_ARG_DECL) +Sender_i::send_message (void) { // NOTE:No synchronization with purpose. Synchrnozing this is // going to spoil the whole purpose of this test. @@ -66,5 +66,4 @@ Sender_i::send_message (ACE_ENV_SINGLE_ARG_DECL) this->receivers_[send_to]->receive_payload (this->payload_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index 91b4b729db0..b68d1c03525 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -30,7 +30,7 @@ public: Sender::Table_Full)); /// Public method defined locally - void send_message (ACE_ENV_SINGLE_ARG_DECL); + void send_message (void); private: /// Synchronizing acces to this class diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index 846fde96ea4..0112e68565d 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/Server_Task.cpp @@ -55,8 +55,7 @@ Server_Task::svc (void) if (i%50 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending message ....\n")); - this->sender_->send_message (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sender_->send_message (); // Sanity check for connections.. if (connection_no < diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 23566a7d242..2219a95abc5 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -45,14 +45,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,11 +59,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -77,7 +73,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -87,29 +82,24 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Sender_var sender = Sender::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) { @@ -128,13 +118,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (receiver); Receiver_var receiver_obj = - receiver->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + receiver->_this (); // Send the calback object to the server sender->receiver_object (receiver_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Threads that will handle the call backs Client_Task client_task (orb.in (), @@ -157,7 +145,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 7aeeeecdbc8..4876eec1af4 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -61,7 +61,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -69,7 +68,6 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,11 +77,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -95,7 +91,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -105,19 +100,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Manual_Event manual_event; @@ -132,17 +124,14 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = child_poa->activate_object (sender ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -183,7 +172,6 @@ main (int argc, char *argv[]) // Call the ORB run from the main thread orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); } @@ -193,7 +181,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index aaab6575632..aff218f1b77 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -64,7 +64,7 @@ public: // The thread entry point. private: - void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void validate_connection (void); // Validate the connection private: @@ -82,18 +82,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -116,12 +113,10 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -144,7 +139,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Client::validate_connection (void) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -153,8 +148,7 @@ Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->test_method (); } ACE_CATCHANY {} ACE_ENDTRY; } @@ -165,13 +159,11 @@ Client::svc (void) { ACE_TRY_NEW_ENV { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->test_method (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 6a6f1db233d..d9910efc06e 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -75,18 +75,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -107,8 +104,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -145,15 +141,12 @@ Client::svc (void) char* argv[1] = { argv0.inout () }; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -163,8 +156,7 @@ Client::svc (void) 1); } - server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index bf5e6312642..39c7be71a69 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -65,12 +61,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index 056dd155a72..8d489b5a1a1 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -9,13 +9,13 @@ ACE_RCSID(MT_Client, test_i, "$Id$") void -Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 414abe39862..79dd079bf2d 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index 3948231f376..fafbba7f140 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -52,18 +52,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -77,7 +74,6 @@ main (int argc, char *argv[]) { CORBA::Long r = server->test_method (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != i) { @@ -89,8 +85,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCHANY diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 982fc2cbc28..869e34a81bc 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -67,11 +67,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,11 +78,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -92,12 +88,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -114,8 +108,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Worker worker (orb.in ()); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, @@ -152,8 +145,7 @@ Worker::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index c60a8eee1f7..9b86a943a1d 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -22,7 +22,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h index 754314ec14b..a792141e72c 100644 --- a/TAO/tests/MT_Server/test_i.h +++ b/TAO/tests/MT_Server/test_i.h @@ -34,7 +34,7 @@ public: CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 29bb6e0502d..0900694abce 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -54,16 +54,13 @@ Client_Task::svc (void) ACE_TRY { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); CORBA::Object_var object = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TimeBase::TimeT timeout_period = 10 * this->timeout_; @@ -76,17 +73,14 @@ Client_Task::svc (void) this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeout_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (int i = 0; i != this->iterations_; ++i) { - int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + int retval = this->one_iteration (); if (retval == 1) successful_calls++; @@ -119,14 +113,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (void) { ACE_TRY { for (int i = 0; i != 100; ++i) { (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::TRANSIENT, ex) @@ -134,11 +127,10 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) // Ignore transient exceptions } ACE_ENDTRY; - ACE_CHECK; } int -Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::one_iteration (void) { ACE_TRY { @@ -146,7 +138,6 @@ Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL) this->sleep_service_->go_to_sleep (this->sleep_time_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value end = ACE_OS::gettimeofday (); diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index e3affca8bfa..62d419c2ba1 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -55,10 +55,10 @@ public: private: /// Run one iteration of the test - int one_iteration (ACE_ENV_SINGLE_ARG_DECL); + int one_iteration (void); /// Make sure that the thread has a connection available - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); + void validate_connection (void); private: /// A reference to the ORB diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp index 863f5f50c64..f8e4e6b0379 100644 --- a/TAO/tests/MT_Timeout/Server_Task.cpp +++ b/TAO/tests/MT_Timeout/Server_Task.cpp @@ -22,7 +22,6 @@ Server_Task::svc (void) ACE_TRY { this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index 5a6b7d95bcf..4e19c308db6 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -24,7 +24,7 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds } void -Sleep_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Sleep_Service::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index bc1c17e9210..8407220a7eb 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -21,7 +21,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index 21262fc921d..9ed794013b9 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -52,18 +52,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Sleep_Service_var sleep_service = Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sleep_service.in ())) { @@ -96,13 +93,10 @@ main (int argc, char *argv[]) // Get back in sync with the server.. sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - sleep_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sleep_service->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Task 0: Successful calls = %d, timed out calls = %d\n", diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index c3a5b91ae3e..585b3cfe666 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -40,15 +40,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +53,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(sleep_service_impl); Test::Sleep_Service_var process = - sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sleep_service_impl->_this (); CORBA::String_var ior = orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,8 +80,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (ACE_Thread_Manager::instance (), orb.in (), @@ -103,10 +96,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp index 82806ba2af4..01561fca7b5 100644 --- a/TAO/tests/Multiple/Collocation_Tester.cpp +++ b/TAO/tests/Multiple/Collocation_Tester.cpp @@ -40,7 +40,7 @@ Collocation_Tester::match_answer (const char *actual_answer, } int -Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_top (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<TOP>-------------------------------\n"))); @@ -59,8 +59,7 @@ Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n"))); - CORBA::String_var msg = top->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::String_var msg = top->top_quote (); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); @@ -75,7 +74,7 @@ Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL) } int -Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_right (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n"))); @@ -94,13 +93,11 @@ Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n"))); - CORBA::String_var msg = right->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + CORBA::String_var msg = right->top_quote (); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = right->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + msg = right->right_quote (); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); @@ -116,7 +113,7 @@ Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_left (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<LEFT>-------------------------------\n"))); @@ -136,13 +133,11 @@ Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n"))); - CORBA::String_var msg = left->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + CORBA::String_var msg = left->top_quote (); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = left->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(1); + msg = left->left_quote (); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); @@ -158,7 +153,7 @@ Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_bottom (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n"))); @@ -178,23 +173,19 @@ Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n"))); - CORBA::String_var msg = bottom->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(1); + CORBA::String_var msg = bottom->top_quote (); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = bottom->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + msg = bottom->left_quote (); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); - msg = bottom->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(1); + msg = bottom->right_quote (); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); - msg = bottom->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(1); + msg = bottom->bottom_quote (); failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote"); @@ -209,7 +200,7 @@ Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL) } void -Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::shutdown (void) { Multiple::Top_var top = Multiple::Top::_narrow (this->object_.in ()); @@ -224,24 +215,19 @@ Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n"))); - top->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + top->shutdown (); } void -Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Tester::run (void) { - int failure_num = this->test_top (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + int failure_num = this->test_top (); - failure_num += this->test_left (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + failure_num += this->test_left (); - failure_num += this->test_right (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + failure_num += this->test_right (); - failure_num += this->test_bottom (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + failure_num += this->test_bottom (); if (failure_num) ACE_ERROR ((LM_DEBUG, @@ -250,5 +236,5 @@ Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! "))); - this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (); } diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index 19003092151..e220b07b466 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -41,7 +41,7 @@ public: ~Collocation_Tester (); // -- Command -- - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); // Runs the test. @@ -49,19 +49,19 @@ private: // -- Helper Methods -- - int test_top (ACE_ENV_SINGLE_ARG_DECL); + int test_top (void); // Tests the method accessible thru the // Top interface. - int test_right (ACE_ENV_SINGLE_ARG_DECL); + int test_right (void); // Tests the method accessible thru the // Right interface. - int test_left (ACE_ENV_SINGLE_ARG_DECL); + int test_left (void); // Tests the method accessible thru the // Left interface. - int test_bottom (ACE_ENV_SINGLE_ARG_DECL); + int test_bottom (void); // Tests the method accessible thru the // Bottom interface. @@ -74,7 +74,7 @@ private: // is no match (actually 1 is returned if there is // no match. - void shutdown (ACE_ENV_SINGLE_ARG_DECL); + void shutdown (void); private: CORBA::Object_var object_; }; diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index 54e95ead3e1..802b6d3d584 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -48,7 +48,7 @@ Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) } void -Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Bottom_Impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -70,64 +70,59 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) } char * -Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::top_quote (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); CORBA::String_var msg = - this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->delegate_->top_quote (); return msg._retn (); } char * -Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::left_quote (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); CORBA::String_var msg = - this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->delegate_->left_quote (); return msg._retn (); } char * -Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::right_quote (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); CORBA::String_var msg = - this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->delegate_->right_quote (); return msg._retn (); } char * -Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::bottom_quote (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); CORBA::String_var msg = - this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->delegate_->bottom_quote (); return msg._retn (); } void -Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); - this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->shutdown (); //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index e97f97ca80e..e72455225d6 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -40,27 +40,27 @@ public: virtual ~Bottom_Impl (void); // IDL Interface Methods - virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -89,24 +89,24 @@ public: virtual ~Delegated_Bottom_Impl (void); // IDL Interface Methods. - virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp index 8a2d499abce..c46d30c0406 100644 --- a/TAO/tests/Multiple/client.cpp +++ b/TAO/tests/Multiple/client.cpp @@ -12,13 +12,11 @@ int main (int argc, char *argv[]) { // ORB Initialization CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object; // Get The IOR from a file object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) { @@ -27,8 +25,7 @@ int main (int argc, char *argv[]) } Collocation_Tester tester (object.in ()); - tester.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tester.run (); } ACE_CATCHANY { diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index fcaa75221f3..aec287512a3 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -14,19 +14,15 @@ int main (int argc, char *argv[]) { // Orb Initialization CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object; object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager - PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POAManager_var poa_manager = poa->the_POAManager(); // Create the servant. Bottom_Impl servant (orb.in ()); @@ -43,7 +39,6 @@ int main (int argc, char *argv[]) // Now we stringfy the object reference. CORBA::String_var ior = orb->object_to_string (bottom.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -59,8 +54,7 @@ int main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Activate the POAManager - poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate(); orb->run(); } diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index da21a7210b2..69449348a84 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D public: Multiple_Inheritance_i (void); - virtual char* method1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method1 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method1"); } - virtual char* method2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method2 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method2"); } - virtual char* method3 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method3 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method3"); } - virtual char* method4 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method4 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method4"); diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index ce7f8434a2f..8ccf929918a 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -77,7 +77,6 @@ main (int argc, char **argv) // Initialize the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR parse_args (argc, argv); @@ -105,60 +104,46 @@ main (int argc, char **argv) // Get the object reference with the IOR CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var string; // Narrow the object reference A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - string = a->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = a->method1 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = b->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = b->method1 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = b->method2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = b->method2 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = c->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = c->method1 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = c->method3 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = c->method3 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = d->method1 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = d->method2 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method3 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = d->method3 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method4 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + string = d->method4 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); } ACE_CATCHANY diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index d29978c9163..0bc9e14d7ef 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -57,7 +57,6 @@ main (int argc, char **argv) argv, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; @@ -66,7 +65,6 @@ main (int argc, char **argv) orb_manager.activate_under_child_poa ("my_object", &servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ())); @@ -84,8 +82,7 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); } - orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_manager.run (); } ACE_CATCH (CORBA::SystemException, sysex) { diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 6a9cb60d163..09c05cda7be 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -68,7 +68,7 @@ public: // The thread entry point. private: - void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void validate_connection (void); // Validate the connection private: @@ -86,18 +86,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -172,12 +169,10 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -200,7 +195,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Client::validate_connection (void) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -210,7 +205,6 @@ Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { this->server_->test_method (j ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; } @@ -221,13 +215,11 @@ Client::svc (void) { ACE_TRY_NEW_ENV { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); for (int i = 0; i < this->niterations_; ++i) { this->server_->test_method (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index e911f5aa83c..2317b82edfa 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -101,7 +101,7 @@ public: // The thread entry point. private: - void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void validate_connection (void); // Validate the connection private: @@ -126,11 +126,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -139,11 +137,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -156,12 +152,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(server_impl); Simple_Server_var server = - server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl->_this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -178,8 +172,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Worker worker (orb.in ()); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, @@ -228,7 +221,6 @@ Worker::svc (void) { ACE_Time_Value tv (140, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -248,7 +240,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, } void -SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +SelfClient::validate_connection (void) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -260,7 +252,6 @@ SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { this->server_->test_method (j ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; } @@ -271,8 +262,7 @@ SelfClient::svc (void) { ACE_TRY_NEW_ENV { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); for (int i = 0; i < this->niterations_; ++i) { @@ -319,7 +309,6 @@ SelfClient::svc (void) // Just make a call this->server_->test_method (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp index 3b0bc90496b..ab2a816fb2e 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp @@ -23,7 +23,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // We dont shutdown the ORB. We allow the server to go away as it diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h index 754314ec14b..a792141e72c 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.h +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h @@ -34,7 +34,7 @@ public: CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp index 01960176f11..548952c84fe 100644 --- a/TAO/tests/Muxing/Client_Task.cpp +++ b/TAO/tests/Muxing/Client_Task.cpp @@ -33,7 +33,6 @@ Client_Task::svc (void) for (int i = 0; i != this->event_count_; ++i) { this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index d1cd37643c1..f20a339cd74 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -34,7 +34,7 @@ Receiver::receive_data (const Test::Payload &payload } CORBA::Long -Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Receiver::get_event_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); @@ -42,7 +42,7 @@ Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index c297521ed30..30fb08c40ea 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -31,10 +31,10 @@ public: virtual void receive_data (const Test::Payload &payload ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_event_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index b0b3408f831..9cf0b292946 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -28,7 +28,6 @@ Server_Task::svc (void) ACE_Time_Value tv (120, 0); #endif this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index e149b323d49..c1638ce81f8 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -44,18 +44,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Receiver_var receiver = Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (receiver.in ())) { @@ -71,7 +68,7 @@ main (int argc, char *argv[]) } else { - + Client_Task client_task (receiver.in (), #if defined (ACE_OPENVMS) 750, /* test takes much longer on OpenVMS */ @@ -80,21 +77,19 @@ main (int argc, char *argv[]) #endif 32768, ACE_Thread_Manager::instance ()); - + if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1) { ACE_ERROR ((LM_ERROR, "Error activating client task\n")); } ACE_Thread_Manager::instance ()->wait (); - - CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + + CORBA::Long count = receiver->get_event_count (); + ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n", count)); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index ad2a9a98241..0cf3c09e7de 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); Test::Receiver_var receiver = - receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + receiver_impl->_this (); CORBA::String_var ior = orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,8 +80,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (orb.in (), ACE_Thread_Manager::instance ()); @@ -101,10 +94,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 0aa90db52b6..f4ef1c9a440 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -52,7 +52,7 @@ MT_Object_i::yadda (CORBA::Long hop_count, { if (partner != 0) return partner->yadda (hop_count + 1, - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER) + this->_this () ACE_ENV_ARG_PARAMETER) + 1; } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index ba1c615cd55..55af84d9d32 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -166,7 +166,6 @@ MT_Client::run (void) this->mT_Object_var_->yadda (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -214,7 +213,6 @@ MT_Client::init (int argc, char **argv, this->argv_, buf ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -229,7 +227,6 @@ MT_Client::init (int argc, char **argv, CORBA::Object_var object_var = this->orb_var_->string_to_object (this->object_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) ACE_ERROR_RETURN ((LM_ERROR, @@ -238,7 +235,6 @@ MT_Client::init (int argc, char **argv, this->mT_Object_var_ = MT_Object::_narrow (object_var.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) { @@ -252,7 +248,6 @@ MT_Client::init (int argc, char **argv, CORBA::Object_var poa_object = this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -261,14 +256,11 @@ MT_Client::init (int argc, char **argv, PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY { @@ -295,7 +287,6 @@ main (int argc, char **argv) int r = orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 36e81ffa7c3..0cd89b7d91e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -155,7 +155,6 @@ MT_Server::init (int argc, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->parse_args (); // ~~ check for the return value here @@ -164,7 +163,6 @@ MT_Server::init (int argc, this->orb_manager_ptr_->activate_under_child_poa ("MT", &this->mT_Object_i_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -191,7 +189,6 @@ MT_Server::init (int argc, CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) ACE_ERROR_RETURN ((LM_ERROR, @@ -200,7 +197,6 @@ MT_Server::init (int argc, this->mT_Object_var_ = MT_Object::_narrow (object_var.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) { @@ -228,8 +224,7 @@ MT_Server::run () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + int r = this->orb_manager_ptr_->run (); if (r == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -256,7 +251,6 @@ MT_Server::~MT_Server (void) if (this->orb_manager_ptr_) this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -281,13 +275,11 @@ MT_Server::run_ORB_briefly (void) for (unsigned int i = 0; i < this->iterations_; i++) { MT_Object_var tmp = - this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->mT_Object_i_._this (); this->mT_Object_var_->yadda (0, tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index c3e0377bee6..ee7bb23692a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -73,7 +73,6 @@ MT_Object_Server::init (int argc, argv, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -85,7 +84,6 @@ MT_Object_Server::init (int argc, str = this->orb_manager_.activate_under_child_poa ("MT_Object", &this->mT_Object_i_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -107,10 +105,9 @@ MT_Object_Server::init (int argc, int -MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL) +MT_Object_Server::run (void) { - int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int result = this->orb_manager_.run (); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -135,14 +132,12 @@ main (int argc, char *argv[]) ACE_TRY { int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r == -1) return 1; else { - MT_Object_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + MT_Object_Server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index 8d57cc0d23e..289fb53c542 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -52,7 +52,7 @@ public: ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 33dc4890f6a..d4cdb5d0274 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -51,7 +51,6 @@ Client_Task::svc (void) this->server_->start (this->client_.in (), call_count ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -122,7 +121,6 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -131,34 +129,27 @@ main (int argc, CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server_var server = server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client_var client_object = client_servant._this (); Client_Task client_tasks (client_object.in (), server.in ()); @@ -167,14 +158,12 @@ main (int argc, if (shutdown_server) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp index af61f40ba94..3d4db29c601 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp @@ -25,6 +25,5 @@ client_i::ping (CORBA::UShort time_to_live { this->server_->ping (time_to_live ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index f9f3763ca91..5c2e9e4db9d 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -36,8 +36,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -122,7 +121,6 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -131,29 +129,23 @@ main (int argc, CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); server_i server_servant (quiet, orb.in ()); - server_var server_object = server_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_var server_object = server_servant._this (); CORBA::String_var ior = orb->object_to_string (server_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = write_ior_to_file (ior.in ()); if (result != 0) @@ -175,7 +167,6 @@ main (int argc, root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index 6e6a9b7ade4..e928eb9bc1d 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -18,7 +18,6 @@ server_i::start (client_ptr c, this->client_ = client::_duplicate (c); this->ping (time_to_live ACE_ENV_ARG_PARAMETER); - ACE_CHECK; return; } @@ -39,15 +38,13 @@ server_i::ping (CORBA::UShort time_to_live { this->client_->ping (time_to_live ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index a92ecc85d08..565517aa648 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -17,7 +17,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index a014035dc5e..efb4fb57796 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -54,7 +54,6 @@ Client_Task::svc (void) this->server_->start (this->client_.in (), call_count ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -131,7 +130,6 @@ main (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -140,34 +138,27 @@ main (int argc, CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server_var server = server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client_var client_object = client_servant._this (); Client_Task client_tasks (client_object.in (), server.in ()); @@ -177,14 +168,12 @@ main (int argc, if (shutdown_server) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index 1f3195d982a..c23ffbbd598 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -36,7 +36,7 @@ Initiator_i::~Initiator_i (void) } void -Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL) +Initiator_i::foo_object_B (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -46,7 +46,6 @@ Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL) { this->object_B_var_->foo (this->object_A_var_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n")); } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index 50f01bf658f..fcbdd219d2d 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,7 +35,7 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (ACE_ENV_SINGLE_ARG_DECL) + virtual void foo_object_B (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 0f0e6431660..a354261d180 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -43,8 +43,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr { ACE_TRY { - theInitiator_ptr->foo_object_B (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + theInitiator_ptr->foo_object_B (); while (!this->finish_two_way_call_) TAO_ORB_Core_instance ()->reactor ()->handle_events (); @@ -58,7 +57,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr } void -Object_A_i::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_A_i::finish (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->finish_two_way_call_ = 1; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 83c771f5a6f..fe7a73cc1ff 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -38,7 +38,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void finish (ACE_ENV_SINGLE_ARG_DECL) + virtual void finish (void) ACE_THROW_SPEC ((CORBA::SystemException)); unsigned long finish_two_way_call_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 6d2b87560d5..5b21ce7dc82 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -46,8 +46,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n")); - theObject_A_ptr->finish (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + theObject_A_ptr->finish (); // Start to wait on this variable, it is set to true // by the method finish () diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 6e653ca4040..571f68354fd 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -130,7 +130,6 @@ Initiator_Server::init (int argc, argv, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -151,11 +150,9 @@ Initiator_Server::init (int argc, CORBA::Object_var object_A_obj_var = this->orb_manager_.orb()->string_to_object (this->object_A_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->object_A_var_ = Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->object_A_var_.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -176,11 +173,9 @@ Initiator_Server::init (int argc, CORBA::Object_var object_B_obj_var = this->orb_manager_.orb()->string_to_object (this->object_B_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->object_B_var_ = Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->object_B_var_.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -196,8 +191,7 @@ Initiator_Server::init (int argc, ACE_DEBUG ((LM_DEBUG, "Object B received OK\n")); - this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_manager_.activate_poa_manager (); } ACE_CATCH (CORBA::SystemException, sysex) { @@ -219,7 +213,6 @@ Initiator_Server::init (int argc, this->str_ = this->orb_manager_.activate (this->initiator_i_ptr_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -232,7 +225,7 @@ Initiator_Server::init (int argc, int -Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Initiator_Server::run (void) { ACE_TRY { @@ -241,11 +234,9 @@ Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL) "foo on Object A\n")); Initiator_var initiator = - this->initiator_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->initiator_i_ptr_->_this(); this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Initiator_Server::run: Returned from invoke " "foo on Object A\n")); @@ -277,7 +268,6 @@ Initiator_Server::~Initiator_Server (void) { this->orb_manager_.deactivate (this->str_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -301,14 +291,12 @@ main (int argc, char *argv[]) int retval = initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval == -1) return 1; else { - initiator_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + initiator_Server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 137f31e0dc6..08b6e608d2c 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -55,7 +55,7 @@ public: ACE_ENV_ARG_DECL); // Initialize the Initiator_Server state - parsing arguments and ... - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index 8ab9fe10dfe..ed9dc79250f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -74,7 +74,6 @@ Object_A_Server::init (int argc, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -85,7 +84,6 @@ Object_A_Server::init (int argc, this->orb_manager_.activate_under_child_poa ("object_A", &this->object_A_i_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (this->ior_output_file_) { @@ -101,10 +99,9 @@ Object_A_Server::init (int argc, int -Object_A_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Object_A_Server::run (void) { - int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int r = this->orb_manager_.run (); if (r == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -130,14 +127,12 @@ main (int argc, char *argv[]) { int retval = object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_A_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + object_A_Server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index 842cae01b00..c2e7382586e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -52,7 +52,7 @@ public: ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 47837342aaa..52468d0897e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -74,7 +74,6 @@ Object_B_Server::init (int argc, "child_poa" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -85,7 +84,6 @@ Object_B_Server::init (int argc, this->orb_manager_.activate_under_child_poa ("object_B", &this->object_B_i_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (this->ior_output_file_) { @@ -100,10 +98,9 @@ Object_B_Server::init (int argc, int -Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Object_B_Server::run (void) { - int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int result = this->orb_manager_.run (); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -129,14 +126,12 @@ main (int argc, char *argv[]) ACE_TRY { int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_B_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + object_B_Server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 3661f99bd71..eb2f1c2dbfe 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -52,7 +52,7 @@ public: ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb private: diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index ac198b31bd6..064db07d85b 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -80,7 +80,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -90,48 +89,39 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Get an object reference from the argument string. object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. server_var server_object = server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client_i servant (server_object.in ()); servant.loop (event_loop_depth, event_loop_iterations ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Shutdown server. if (shutdown_server) { - server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_object->shutdown (); } root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -141,7 +131,6 @@ main (int argc, char **argv) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 134bd31f46a..32f725a8fc4 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -45,21 +45,17 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return -1; @@ -67,13 +63,11 @@ main (int argc, char *argv[]) server_i servant (orb.in ()); server_var server_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,18 +80,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 7b27990c225..c05f95b0850 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -25,20 +25,17 @@ server_i::loop (client_ptr remote_partner, this->run_no_ops (remote_partner, event_loop_iterations / 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, event_loop_iterations ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } this->run_no_ops (remote_partner, event_loop_iterations / 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -74,12 +71,10 @@ server_i::run_no_ops (client_ptr remote_partner, remote_partner->oneway_no_op (act_for_iterations, act_for_flag ACE_ENV_ARG_PARAMETER); - ACE_CHECK; while (!got_reply) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->perform_work (); } } } @@ -111,12 +106,11 @@ server_i::no_op (client_ptr remote_partner, *pointer_to_flag = 1; - remote_partner->twoway_no_op (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + remote_partner->twoway_no_op (); } void -server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 @@ -144,14 +138,12 @@ client_i::loop (CORBA::ULong event_loop_depth, ACE_TRY { client_var self = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); this->remote_partner_->loop (self.in (), event_loop_depth, event_loop_iterations ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -172,14 +164,12 @@ client_i::oneway_no_op (const act &act_for_iterations, ACE_TRY { client_var self = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); this->remote_partner_->no_op (self.in (), act_for_iterations, act_for_flag ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -190,7 +180,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } void -client_i::twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +client_i::twoway_no_op (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h index 37d1b80f541..4bde5b548d4 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.h +++ b/TAO/tests/Nested_Event_Loop/test_i.h @@ -24,7 +24,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -46,7 +46,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void twoway_no_op (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index 072e1f6f457..a0640709892 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -38,19 +38,17 @@ Client_Peer::callme(Test::Peer_ptr callback, if (max_depth > 0) { Test::Peer_var me = - this->_this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this(); Test::Payload return_data; callback->callme(me.in(), max_depth - 1, return_data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Client_Peer::crash(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Peer::crash(void) ACE_THROW_SPEC((CORBA::SystemException)) { Crasher * crasher = new Crasher; @@ -61,7 +59,7 @@ Client_Peer::crash(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Client_Peer::noop(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Peer::noop(void) ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h index bd913ce1782..9a22962deff 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h @@ -22,9 +22,9 @@ public: Test::Payload const & ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - void crash(ACE_ENV_SINGLE_ARG_DECL) + void crash(void) ACE_THROW_SPEC((CORBA::SystemException)); - void noop(ACE_ENV_SINGLE_ARG_DECL) + void noop(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index 658ffeb935a..ada0fd93997 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -40,8 +40,7 @@ Server_Peer::callme(Test::Peer_ptr callback, { ACE_TRY { - callback->crash(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback->crash(); } ACE_CATCHANY { @@ -49,13 +48,11 @@ Server_Peer::callme(Test::Peer_ptr callback, ACE_ENDTRY; // orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - // ACE_CHECK; } else if (max_depth > 0) { Test::Peer_var me = - this->_this(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this(); Test::Payload extra_data(this->payload_size_); extra_data.length(this->payload_size_); @@ -63,19 +60,18 @@ Server_Peer::callme(Test::Peer_ptr callback, max_depth - 1, extra_data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Server_Peer::crash(ACE_ENV_SINGLE_ARG_DECL) +Server_Peer::crash(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_THROW(CORBA::NO_IMPLEMENT ()); } void -Server_Peer::noop(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Peer::noop(void) ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h index c1ee59f802f..ddd641be141 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h @@ -24,9 +24,9 @@ public: Test::Payload const & extra_data ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - void crash(ACE_ENV_SINGLE_ARG_DECL) + void crash(void) ACE_THROW_SPEC((CORBA::SystemException)); - void noop(ACE_ENV_SINGLE_ARG_DECL) + void noop(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 0bafc403012..69d8a2a99bb 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -37,17 +37,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,16 +52,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -79,14 +73,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -98,18 +89,15 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(impl); Test::Peer_var local_peer = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Peer_var peer = Test::Peer::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (peer.in ())) { @@ -119,8 +107,7 @@ main (int argc, char *argv[]) 1); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Timer timer(local_peer.in (), peer.in ()); @@ -130,16 +117,13 @@ main (int argc, char *argv[]) ACE_Time_Value run_time(120, 0); orb->run (run_time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index ca3ac54ea98..3bbb2971948 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -31,17 +31,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -56,14 +53,11 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (parse_args (argc, argv) != 0) return 1; @@ -71,12 +65,10 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Peer_var peer = Test::Peer::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (peer.in ())) { @@ -88,15 +80,14 @@ main (int argc, char *argv[]) while(1) { - peer->noop (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + peer->noop (); } /* Warning with TRU 64 builds ACE_DEBUG ((LM_DEBUG, "(%P|%t) scavenger - event loop finished\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK;*/ + orb->destroy (); +/ } ACE_CATCHANY { diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 0b7eb0628fe..a4d01dea06d 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -40,17 +40,14 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,16 +55,13 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -82,15 +76,12 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime (); @@ -106,13 +97,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(impl); Test::Peer_var peer = - impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->_this (); CORBA::String_var ior = orb->object_to_string (peer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -124,8 +113,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Sleeper sleeper (orb.in ()); @@ -135,17 +123,14 @@ main (int argc, char *argv[]) // ACE_Time_Value run_time(600, 0); // orb->run (run_time ACE_ENV_ARG_PARAMETER); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index 4034e1245c9..ccec464d929 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -78,18 +78,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -101,8 +98,7 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } Client client (server.in (), niterations); @@ -118,8 +114,7 @@ main (int argc, char *argv[]) - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -148,8 +143,7 @@ Client::svc (void) { for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->test_method (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp index bf5e6312642..39c7be71a69 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -65,12 +61,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp index 32bbdd97bcb..a6ab6e91767 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -10,13 +10,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) } void -Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h index 0189dc49b87..b411d5499b9 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h @@ -18,10 +18,10 @@ public: // ctor // = The Simple_Server methods. - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index 851de09a37c..0f84c1dfe81 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -62,7 +62,7 @@ Test_impl::get_vb( } void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index d7ba0a3f399..2c934a6cffb 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -36,10 +36,10 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual OBV_AnyTest::VB * get_vb (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual OBV_AnyTest::VB * get_vb (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index 2b020e6427c..916e9d3038b 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -43,7 +43,6 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -58,7 +57,6 @@ main (int argc, char *argv[]) orb->register_value_factory (va_factory->tao_repository_id (), va_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; va_factory->_remove_ref (); // release ownership @@ -70,7 +68,6 @@ main (int argc, char *argv[]) orb->register_value_factory (vb_factory->tao_repository_id (), vb_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; vb_factory->_remove_ref (); // release ownership // Do local test @@ -135,11 +132,9 @@ main (int argc, char *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; OBV_AnyTest::Test_var test = OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -154,7 +149,6 @@ main (int argc, char *argv[]) CORBA::Any_var result = test->get_something ( 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(result.inout () >>= dst) || dst->id () != magic) { @@ -168,7 +162,6 @@ main (int argc, char *argv[]) result = test->get_something ( 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(result.inout () >>= dst_vb) || dst_vb->id () != magic) { @@ -199,7 +192,6 @@ main (int argc, char *argv[]) result = test->get_something ( 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(result.inout () >>= CORBA::Any::to_value(target.out()))) { @@ -216,11 +208,9 @@ main (int argc, char *argv[]) } #endif /* TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING */ - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n")); } diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index aadb21d4cd5..d5567d9696f 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,12 +67,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); OBV_AnyTest::Test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -88,21 +82,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n")); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp index 3c8697e8415..cc27085a734 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp @@ -31,7 +31,6 @@ Client_Task::svc (void) this->corb_->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -43,7 +42,6 @@ Client_Task::svc (void) this->corb_->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -55,7 +53,6 @@ Client_Task::svc (void) this->corb_->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. @@ -63,10 +60,8 @@ Client_Task::svc (void) // Obtain reference to the object. CORBA::Object_var tmp = this->corb_->string_to_object(this->input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -163,7 +158,6 @@ Client_Task::svc (void) TreeController_var tc_result = test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The following two ifs will fail until bug 1390 is fixed. if (is_equal_tree (tc.in (), tc_result.in ())) @@ -179,8 +173,7 @@ Client_Task::svc (void) 1); } - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); } @@ -201,7 +194,7 @@ Client_Task::is_equal_tree (TreeController * tree1, TreeController * tree2) { return is_equal_node (tree1->root (), tree2->root ()); } - + int Client_Task::is_equal_node (BaseNode * node1, BaseNode * node2) diff --git a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp index be09bb0c6db..4810498ea88 100644 --- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp @@ -56,7 +56,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -80,7 +79,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index 79efb6141fb..29fc693923e 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -37,7 +37,6 @@ Server_Task::svc (void) this->sorb_->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -49,7 +48,6 @@ Server_Task::svc (void) this->sorb_->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -61,18 +59,15 @@ Server_Task::svc (void) this->sorb_->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,8 +75,7 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_impl *test_impl; ACE_NEW_RETURN (test_impl, @@ -90,12 +84,10 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test_var test = test_impl->_this (); CORBA::String_var ior = this->sorb_->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the this->output_ exists, output the ior to it FILE *output_file= ACE_OS::fopen (this->output_, "w"); @@ -107,21 +99,17 @@ Server_Task::svc (void) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp index 03b0440a092..adda7e06dda 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp @@ -40,7 +40,7 @@ Test_impl::reflect (TreeController * tc } void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h index 725369e944a..075ad0cb0ca 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h @@ -38,7 +38,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp index ee0512b4177..f2fc37618ad 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp @@ -47,13 +47,12 @@ Value2_init_impl::create ( } CORBA::ValueBase * -Value2_init_impl::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL) +Value2_init_impl::create_for_unmarshal (void) { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_THROW_EX (ret_val, Value2_impl, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return ret_val; } diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h index 895d9fb808b..a42c6089ee9 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.h +++ b/TAO/tests/OBV/Factory/FactoryC_impl.h @@ -57,7 +57,7 @@ public: public: - virtual CORBA::ValueBase * create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::ValueBase * create_for_unmarshal (void); }; diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index 49bd2e9401b..bfc2842ae64 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) } OBV_FactoryTest::BaseValue * -Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_base_value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::BaseValue* ret_val = 0; @@ -24,7 +24,7 @@ Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } OBV_FactoryTest::Value1 * -Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_value1 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value1* ret_val = 0; @@ -36,7 +36,7 @@ Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } OBV_FactoryTest::Value2 * -Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_value2 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value2* ret_val = 0; @@ -48,7 +48,7 @@ Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h index 8a1e97a6a5a..271bcdd2788 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.h +++ b/TAO/tests/OBV/Factory/FactoryS_impl.h @@ -31,16 +31,16 @@ public: Test_impl (CORBA::ORB_ptr orb); // ctor - virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::BaseValue * get_base_value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::Value1 * get_value1 (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::Value2 * get_value2 (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp index 2b6a232470a..efe47235d4f 100644 --- a/TAO/tests/OBV/Factory/client.cpp +++ b/TAO/tests/OBV/Factory/client.cpp @@ -43,8 +43,7 @@ no_factory (OBV_FactoryTest::Test_ptr test) // Calling this without a factory registred should give a marshal // exception with minor code 1 OBV_FactoryTest::BaseValue_var base_value = - test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->get_base_value (); } ACE_CATCH (CORBA::MARSHAL, ex) { @@ -74,7 +73,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -82,11 +80,9 @@ main (int argc, char *argv[]) // Obtain reference to the object CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; OBV_FactoryTest::Test_var test = OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -110,7 +106,6 @@ main (int argc, char *argv[]) orb->register_value_factory (base_factory->tao_repository_id (), base_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; base_factory->_remove_ref (); // release ownership OBV_FactoryTest::Value1_init *value1_factory = 0; @@ -121,7 +116,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value1_factory->tao_repository_id (), value1_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value1_factory->_remove_ref (); OBV_FactoryTest::Value2_init *value2_factory = 0; @@ -132,22 +126,18 @@ main (int argc, char *argv[]) orb->register_value_factory (value2_factory->tao_repository_id (), value2_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value2_factory->_remove_ref (); // Now perform the test. I don't check return values. // I just hope to get MARSHAL. OBV_FactoryTest::BaseValue_var base_value = - test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->get_base_value (); OBV_FactoryTest::Value1_var value1 = - test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->get_value1 (); OBV_FactoryTest::Value2_var value2 = - test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->get_value2 (); // Test factories. @@ -160,11 +150,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 5f6788e57d4..66fec931f07 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,12 +67,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); OBV_FactoryTest::Test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -88,19 +82,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index 2a3eb140309..ea3bc443b48 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -43,7 +43,7 @@ Test_impl::reflect (TreeController * tc } void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index 745f255ad87..7e2cc36574b 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -36,7 +36,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index b61d1544147..77d6ba5a4cb 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -86,7 +86,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -103,7 +102,6 @@ main (int argc, char *argv[]) orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -115,7 +113,6 @@ main (int argc, char *argv[]) orb->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -127,7 +124,6 @@ main (int argc, char *argv[]) orb->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. @@ -135,10 +131,8 @@ main (int argc, char *argv[]) // Obtain reference to the object. CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -192,18 +186,15 @@ main (int argc, char *argv[]) TreeController_var result_tc = test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Dump the resulting tree. dump_tree (result_tc.in ()); - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index bf17c26cc87..2888506ce84 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -45,7 +45,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // All factories are kindly provided by // compiler so we just to put everything in a right order. @@ -59,7 +58,6 @@ main (int argc, char *argv[]) orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -71,7 +69,6 @@ main (int argc, char *argv[]) orb->register_value_factory (tc_factory->tao_repository_id (), tc_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -83,18 +80,15 @@ main (int argc, char *argv[]) orb->register_value_factory (sn_factory->tao_repository_id (), sn_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -102,8 +96,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -115,12 +108,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test_var test = test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -132,19 +123,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp index c3548daf462..955841cb593 100644 --- a/TAO/tests/OBV/Simple/Client_i.cpp +++ b/TAO/tests/OBV/Simple/Client_i.cpp @@ -31,18 +31,15 @@ Checkpoint_Client_i::run (const char *name, Event_var t_e (static_cast<Event*> (new Event_impl (value))); t_e->do_print (); checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value = 34; t_e = new Event_impl (value); t_e->do_print (); checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (checkpoint.shutdown () == 1) - checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + checkpoint->shutdown (); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -50,7 +47,6 @@ Checkpoint_Client_i::run (const char *name, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp index f55cee0af44..6b37d9f1af8 100644 --- a/TAO/tests/OBV/Simple/OBV_impl.cpp +++ b/TAO/tests/OBV/Simple/OBV_impl.cpp @@ -26,7 +26,7 @@ Event_impl::_copy_value (void) void -Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_impl::do_print (void) { ACE_DEBUG((LM_DEBUG, "(value %d) \n", (CORBA::ULong) this->value_())); @@ -37,7 +37,7 @@ Event_factory::~Event_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event) -Event_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_factory::create_for_unmarshal (void) { return new Event_impl; } diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h index 1b619553402..7ef69a968b9 100644 --- a/TAO/tests/OBV/Simple/OBV_impl.h +++ b/TAO/tests/OBV/Simple/OBV_impl.h @@ -18,7 +18,7 @@ class Event_impl : public virtual OBV_Event, virtual CORBA::ValueBase* _copy_value (void); - virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); + virtual void do_print (void); }; class Event_factory : public CORBA::ValueFactoryBase @@ -33,7 +33,7 @@ protected: private: - TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void); }; #endif /* OBV_IMPL_H */ diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp index a429ce1bc3a..6f7bbb07512 100644 --- a/TAO/tests/OBV/Simple/Server_i.cpp +++ b/TAO/tests/OBV/Simple/Server_i.cpp @@ -55,7 +55,7 @@ Checkpoint_i::put_event (Event *event // Shutdown the server application. void -Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Checkpoint_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index 979bc54cc79..e20e22eb249 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -83,7 +83,6 @@ Server<Servant>::init (const char *servant_name, "init_child_poa"), -1); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -108,7 +107,6 @@ Server<Servant>::init (const char *servant_name, this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", @@ -135,10 +133,10 @@ Server<Servant>::init (const char *servant_name, } template <class Servant>int -Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL) +Server<Servant>::run (void) { // Run the main event loop for the ORB. - if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run () == -1) ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1); @@ -250,7 +248,6 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_, name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -262,7 +259,6 @@ Client<InterfaceObj, Var>::init (const char *name, { CORBA::Object_var server_object = this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -272,7 +268,6 @@ Client<InterfaceObj, Var>::init (const char *name, -1); this->server_ = InterfaceObj::_narrow (server_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else ACE_ERROR_RETURN ((LM_ERROR, @@ -294,7 +289,7 @@ Client<InterfaceObj, Var>::init (const char *name, template <class InterfaceObj, class Var> int -Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client<InterfaceObj, Var>::obtain_initial_references (void) { return 0; diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index 380dc749dc6..ef7230a7996 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -60,7 +60,7 @@ public: // After calling <init>, this method will register the server with // the TAO Naming Service using the servant_name passed to <init>. - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb. protected: @@ -121,7 +121,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL); + int obtain_initial_references (void); // Initialize naming service protected: diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp index c5f5140f307..5f6a2bb5a07 100644 --- a/TAO/tests/OBV/Simple/server.cpp +++ b/TAO/tests/OBV/Simple/server.cpp @@ -23,8 +23,7 @@ main (int argc, char *argv[]) return 1; else { - server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.run (); } } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index eeccce8dc1d..25d27ca312e 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -17,18 +17,15 @@ vt_graph_impl::vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL) { nodes_ ().length (0); add_node ("ROOT" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; for (int i = 1; i < num_nodes; i++) { add_node ("CHILD" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; nodes_ ()[0]->add_edge (nodes_ ()[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } // Get the number of nodes in the vt_graph. -CORBA::Long vt_graph_impl::size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Long vt_graph_impl::size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return nodes_ ().length (); @@ -47,7 +44,7 @@ vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL_NOT_USED) // Print out information about each node. void -vt_graph_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +vt_graph_impl::print (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -99,12 +96,9 @@ test_impl::pass_obj_graph_in ( ACE_THROW_SPEC (( CORBA::SystemException)) { - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 3); graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 4); } void @@ -114,12 +108,9 @@ test_impl::pass_vt_graph_in ( ACE_THROW_SPEC (( CORBA::SystemException)) { - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 3); vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 4); } void @@ -131,16 +122,11 @@ test_impl::pass_obj_graph_out ( { vt_graph_impl * the_vt_graph = 0; ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; - graph_param = the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + graph_param = the_vt_graph->_this (); - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 4); graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 5); } void @@ -153,15 +139,11 @@ test_impl::pass_vt_graph_out ( vt_graph_impl * the_vt_graph = 0; ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; vt_graph_param = the_vt_graph; - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 4); vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 5); } @@ -173,12 +155,9 @@ test_impl::pass_obj_graph_inout ( CORBA::SystemException)) { - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 6); graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7); - ACE_CHECK; + ACE_ASSERT (graph_param->size () == 7); } void @@ -189,26 +168,22 @@ test_impl::pass_vt_graph_inout ( CORBA::SystemException)) { - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 6); vt_graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7); - ACE_CHECK; + ACE_ASSERT (vt_graph_param->size () == 7); } void -test_impl::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) +test_impl::start (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -test_impl::finish (ACE_ENV_SINGLE_ARG_DECL) +test_impl::finish (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } @@ -261,7 +236,7 @@ node_impl::change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL_NOT_USED) } void -node_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +node_impl::print (void) ACE_THROW_SPEC ((CORBA::SystemException)) { cout << " Name: " << name_ () << endl; diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 9d0932b1d87..0faf0621804 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -31,7 +31,7 @@ public: void change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void print (ACE_ENV_SINGLE_ARG_DECL) + void print (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -62,14 +62,14 @@ class vt_graph_impl : vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL); - virtual CORBA::Long size (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long size (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void add_node (const char * name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void print (ACE_ENV_SINGLE_ARG_DECL) + virtual void print (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -121,10 +121,10 @@ class test_impl : ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start (ACE_ENV_SINGLE_ARG_DECL) + virtual void start (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void finish (ACE_ENV_SINGLE_ARG_DECL) + virtual void finish (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp index 076d397dfa4..328c4ca9e83 100644 --- a/TAO/tests/OBV/Supports/client.cpp +++ b/TAO/tests/OBV/Supports/client.cpp @@ -43,41 +43,35 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); /* Create, register factories */ Supports_Test::Node_init * node_factory = 0; - + ACE_NEW_RETURN (node_factory, node_init_impl, 1); CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_ASSERT (returned_factory == 0); node_factory->_remove_ref (); @@ -91,8 +85,7 @@ main (int argc, char *argv[]) orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_ASSERT (returned_factory == 0); vt_graph_factory->_remove_ref (); @@ -101,34 +94,30 @@ main (int argc, char *argv[]) /* Check return values for register_value_factory */ Supports_Test::Node_init * node_factory2 = 0; - + ACE_NEW_RETURN (node_factory2, node_init_impl, 1); returned_factory = orb->register_value_factory (node_factory2->tao_repository_id (), node_factory2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_ASSERT (returned_factory == node_factory); node_factory2->_remove_ref (); - + /* Get test object reference */ - + CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Supports_Test::test_var my_test = Supports_Test::test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (my_test.in ())) ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::test obj ref <%s>\n", ior), 1); - my_test->start (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_test->start (); /* Perform test */ @@ -144,82 +133,57 @@ main (int argc, char *argv[]) Supports_Test::vt_graph_var test_vt_graph = the_vt_graph; Supports_Test::graph_var test_graph = - the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + the_vt_graph->_this (); if (CORBA::is_nil (test_graph.in ())) ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::graph obj ref\n"), 1); the_vt_graph->DefaultValueRefCountBase::_add_ref (); // At this point, test_vt_graph and test_graph refer to the same object. - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 3); my_test->pass_vt_graph_in (test_vt_graph.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 3); - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 3); my_test->pass_obj_graph_in (test_graph.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 4); test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_graph->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // After the 'pass_vt_graph_out' call returns, test_vt_graph will refer to // a new object. - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 6); my_test->pass_vt_graph_out (test_vt_graph.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 5); // 'test_graph' still refers to the original object, but after the // 'pass_obj_graph_out' call returns, it will refer to a new object, // residing on the server. - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 6); my_test->pass_obj_graph_out (test_graph.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 5); // test_vt_graph and test_graph now refer to different objects. test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 6); my_test->pass_vt_graph_inout (test_vt_graph.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7); - ACE_TRY_CHECK; + ACE_ASSERT (test_vt_graph->size () == 7); - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 6); my_test->pass_obj_graph_inout (test_graph.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7); - ACE_TRY_CHECK; + ACE_ASSERT (test_graph->size () == 7); } - my_test->finish (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_test->finish (); /* Shut down */ - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id)); diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp index f92eee137c5..6f9ae5f9309 100644 --- a/TAO/tests/OBV/Supports/server.cpp +++ b/TAO/tests/OBV/Supports/server.cpp @@ -12,18 +12,14 @@ main (int argc, char * argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1); - PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); /* Create, register factories */ @@ -33,7 +29,6 @@ main (int argc, char * argv[]) ACE_NEW_RETURN (node_factory, node_init_impl, 1); CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (returned_factory == 0); @@ -44,7 +39,6 @@ main (int argc, char * argv[]) ACE_NEW_RETURN (vt_graph_factory, vt_graph_init_impl, 1); returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (returned_factory == 0); @@ -56,11 +50,9 @@ main (int argc, char * argv[]) //PortableServer::ServantBase_var owner_transfer = a_test_impl; - Supports_Test::test_ptr a_test = a_test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Supports_Test::test_ptr a_test = a_test_impl->_this (); CORBA::String_var ior = orb->object_to_string (a_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE * output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -70,20 +62,15 @@ main (int argc, char * argv[]) ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - a_test_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + a_test_impl->_remove_ref (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (0, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Server (%P.%t) completed test successfully\n")); } diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 25da5405c51..98ded1b3373 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -3,8 +3,8 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID (TC_Alignment, - client, +ACE_RCSID (TC_Alignment, + client, "$Id$") static const char *ior_input_file = "file://test.ior"; @@ -31,7 +31,6 @@ register_factories (CORBA::ORB_ptr orb orb->register_value_factory (factory1->tao_repository_id (), factory1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); factory1->_remove_ref (); @@ -43,7 +42,6 @@ register_factories (CORBA::ORB_ptr orb orb->register_value_factory (factory3->tao_repository_id (), factory3 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); factory3->_remove_ref (); @@ -55,7 +53,6 @@ register_factories (CORBA::ORB_ptr orb orb->register_value_factory (factory5->tao_repository_id (), factory5 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); factory5->_remove_ref (); @@ -67,20 +64,18 @@ register_factories (CORBA::ORB_ptr orb orb->register_value_factory (factory7->tao_repository_id (), factory7 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); factory7->_remove_ref (); return 0; } int -run_test (test_ptr objref, +run_test (test_ptr objref, CORBA::Long offset ACE_ENV_ARG_DECL) { CORBA::Any_var result = objref->get_value (offset ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Boolean status = 0; CORBA::Long member_value = 0; @@ -159,30 +154,27 @@ parse_args (int argc, char *argv[]) return 0; } -int +int main (int argc, char* argv[]) { ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "" + CORBA::ORB_var orb = CORBA::ORB_init (argc, + argv, + "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) { return 1; } - CORBA::Object_var obj = + CORBA::Object_var obj = orb->string_to_object (ior_input_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int status = register_factories (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status != 0) { @@ -197,12 +189,10 @@ main (int argc, char* argv[]) test_var objref = test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::Long i = 1; i < 8; i += 2) { status = run_test (objref.in (), i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { @@ -218,13 +208,11 @@ main (int argc, char* argv[]) } if (do_shutdown) - { - objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + { + objref->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index ba59b23fa58..5277ae3e7b3 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -19,12 +19,10 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) { @@ -36,22 +34,18 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); test_i servant (orb.in ()); test_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", @@ -76,14 +70,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp index b495f0bd3c1..bf1a943de14 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.cpp +++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp @@ -72,7 +72,7 @@ test_i::get_value (CORBA::Long offset } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h index 978cd770426..12be77d3ce4 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.h +++ b/TAO/tests/OBV/TC_Alignment/test_i.h @@ -43,7 +43,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp index 43601e5c165..894f7ef7be1 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -198,7 +198,7 @@ Test_impl::op5 (const CORBA::Any& val, } void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h index 9ae2aa573af..1b7a904d8c2 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h @@ -87,7 +87,7 @@ public: ::CORBA::SystemException )); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp index 4f75c2cd7c8..7c8b962b95c 100644 --- a/TAO/tests/OBV/Truncatable/client.cpp +++ b/TAO/tests/OBV/Truncatable/client.cpp @@ -61,7 +61,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -76,7 +75,6 @@ main (int argc, char *argv[]) orb->register_value_factory (base_factory->tao_repository_id (), base_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; base_factory->_remove_ref (); // release ownership @@ -89,7 +87,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value1_factory->tao_repository_id (), value1_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value1_factory->_remove_ref (); @@ -102,7 +99,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value2_factory->tao_repository_id (), value2_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value2_factory->_remove_ref (); @@ -114,7 +110,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value3_factory->tao_repository_id (), value3_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value3_factory->_remove_ref (); OBV_TruncatableTest::TValue4_init *value4_factory = 0; @@ -125,7 +120,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value4_factory->tao_repository_id (), value4_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value4_factory->_remove_ref (); OBV_TruncatableTest::TValue5_init *value5_factory = 0; @@ -136,7 +130,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value5_factory->tao_repository_id (), value5_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value5_factory->_remove_ref (); OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0; @@ -147,17 +140,14 @@ main (int argc, char *argv[]) orb->register_value_factory (nested_value_factory->tao_repository_id (), nested_value_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; nested_value_factory->_remove_ref (); // Obtain reference to the object CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; OBV_TruncatableTest::Test_var test = OBV_TruncatableTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -184,7 +174,6 @@ main (int argc, char *argv[]) test->op1 ("case1", &v1, ov1.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case1: A<-tB, truncate B to A")); @@ -211,7 +200,6 @@ main (int argc, char *argv[]) test->op1 ("case2", &v2, ov2.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case2: A<-tB<-tC, truncate C to A")); @@ -230,7 +218,6 @@ main (int argc, char *argv[]) test->op2 (&v2, "case3", otv1.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case3: A<-tB<-tC, truncate C to B")); @@ -256,7 +243,6 @@ main (int argc, char *argv[]) test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case3b: A<-tB, truncatable but no truncation")); @@ -326,7 +312,6 @@ main (int argc, char *argv[]) pretest = fail; test->op1 ("case5", &v5, ov5.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case5: A<-tB<-tC, B & C have nested value type, truncate C to A")); @@ -345,7 +330,6 @@ main (int argc, char *argv[]) pretest = fail; test->op3 ("case6", &v5, otv4.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case6: A<-tB<-tC, B & C have nested value type, truncate C to B")); @@ -370,7 +354,6 @@ main (int argc, char *argv[]) pretest = fail; test->op1 ("case7", &iv, ov.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case7: A<-tB, B has no data, truncate B to A")); @@ -414,7 +397,6 @@ main (int argc, char *argv[]) OBV_TruncatableTest::BaseValue_var ov = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case8: multiple IN truncatable valuetype parameters" @@ -445,7 +427,6 @@ main (int argc, char *argv[]) test->op2 (&v1, "case9", ov1.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case9: A<-tB, truncate unknown B to A")); @@ -475,7 +456,6 @@ main (int argc, char *argv[]) test->op5 (a, "case10", ov1.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case10: A<-tB, known truncatable via Any")); @@ -505,7 +485,6 @@ main (int argc, char *argv[]) test->op5 (a, "case11", ov1.out (), desc.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY (! ACE_OS::strcmp (desc.in (), "case11: A<-tB, unknown truncatable via Any")); @@ -520,11 +499,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb \n")); - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); if (fail) { diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp index c097af17c86..a7fd537d02c 100644 --- a/TAO/tests/OBV/Truncatable/server.cpp +++ b/TAO/tests/OBV/Truncatable/server.cpp @@ -42,15 +42,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,8 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); OBV_TruncatableTest::Test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,8 +83,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); OBV_TruncatableTest::BaseValue_init *base_factory = 0; ACE_NEW_RETURN (base_factory, @@ -100,7 +93,6 @@ main (int argc, char *argv[]) orb->register_value_factory (base_factory->tao_repository_id (), base_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; base_factory->_remove_ref (); // release ownership OBV_TruncatableTest::TValue1_init *value1_factory = 0; @@ -111,7 +103,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value1_factory->tao_repository_id (), value1_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value1_factory->_remove_ref (); OBV_TruncatableTest::TValue4_init *value4_factory = 0; @@ -122,7 +113,6 @@ main (int argc, char *argv[]) orb->register_value_factory (value4_factory->tao_repository_id (), value4_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; value4_factory->_remove_ref (); OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0; @@ -133,19 +123,15 @@ main (int argc, char *argv[]) orb->register_value_factory (nested_value_factory->tao_repository_id (), nested_value_factory ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; nested_value_factory->_remove_ref (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index 2c74111f3f3..f08ffd276c3 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -261,7 +261,7 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1, } -::VBlongarray * +::VBlongarray * Test_impl::array_op1 (::VBlongarray * p1, ::VBlongarray *& p2, ::VBlongarray_out p3 @@ -521,7 +521,7 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1, void -Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index c870e7270ef..d6c9ac780c7 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -146,7 +146,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index bc264fa3110..28ac2315757 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -292,7 +292,6 @@ int test_basic_invocations (Test * test_object) VBlong_var result = test_object->basic_op1(p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY (p2->_value () == (53*3)); OBV_VERITY (p3->_value () == (53*5)); @@ -319,7 +318,6 @@ int test_basic_invocations (Test * test_object) vb_basic::M_VBlong_var mresult = test_object->basic_op2(mp1, mp2, mp3); - ACE_TRY_CHECK; OBV_VERITY (mp2->_value () == (53*3)); OBV_VERITY (mp3->_value () == (53*5)); @@ -335,7 +333,6 @@ int test_basic_invocations (Test * test_object) long lresult = test_object->basic_op3(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY (p2->_value () == (93*3)); OBV_VERITY (p3->_value () == (93*5)); @@ -491,7 +488,6 @@ int test_boxed_string_invocations (Test * test_object) OBV_VERITY (strcmp(p2->_value (), "string2") == 0); VBstring_var result = test_object->string_op1(p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY (strcmp(p2->_value (), "2string") == 0); OBV_VERITY (strcmp(p3->_value (), "2string") == 0); @@ -506,7 +502,6 @@ int test_boxed_string_invocations (Test * test_object) CORBA::String_var sresult = test_object->string_op2(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY (strcmp(p2->_value (), "2second string") == 0); OBV_VERITY (strcmp(p3->_value (), "2second string") == 0); @@ -655,7 +650,6 @@ int test_boxed_sequence_invocations (Test * test_object) OBV_VERITY ((*p1)[3] == 7); VBseqlong_var result = test_object->seq_op1(p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY ((*p2)[0] == 100*3); OBV_VERITY ((*p2)[1] == 99*3); @@ -674,7 +668,6 @@ int test_boxed_sequence_invocations (Test * test_object) test_object->seq_op2(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY ((*p2)[0] == 100*3*3); OBV_VERITY ((*p2)[1] == 99*3*3); @@ -848,7 +841,6 @@ int test_boxed_struct_invocations (Test * test_object) OBV_VERITY ((p1->abstruct()).s2 == 21); VBfixed_struct1_var result = test_object->struct_op1(p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY (p2->l() == 92*3); OBV_VERITY ((p2->abstruct()).s1 == 171*3); @@ -914,7 +906,6 @@ int test_boxed_struct_invocations (Test * test_object) OBV_VERITY (strcmp(p4->str(), "variable1") == 0); VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6); - ACE_TRY_CHECK; OBV_VERITY (p5->l() == vs2.l*3); OBV_VERITY (strcmp(p5->str(), "2variable") == 0); @@ -933,7 +924,6 @@ int test_boxed_struct_invocations (Test * test_object) test_object->struct_op4(p4->_boxed_in(), p5->_boxed_inout(), p6->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY (p5->l() == vs2.l*3*3); OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0); @@ -1076,7 +1066,6 @@ int test_boxed_array_invocations (Test * test_object) VBlongarray *p3; VBlongarray_var result = test_object->array_op1 (p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY ((*p2)[0] == (3101*3) && (*p2)[1] == (3202*3) @@ -1100,7 +1089,6 @@ int test_boxed_array_invocations (Test * test_object) #if 0 test_object->array_op2(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY ((*p2)[0] == (3101*3*3) && (*p2)[1] == (3202*3*3) @@ -1330,7 +1318,6 @@ int test_boxed_union_invocations (Test * test_object) VBfixed_union1 * p3; VBfixed_union1_var result = test_object->union_op1 (p1, p2, p3); - ACE_TRY_CHECK; OBV_VERITY (p2->_d () == 2); OBV_VERITY (p2->m2 () == 789*3); @@ -1391,7 +1378,6 @@ int test_boxed_union_invocations (Test * test_object) VBvariable_union1 * p6; VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6); - ACE_TRY_CHECK; OBV_VERITY (p5->_d () == 2); OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0); @@ -1409,7 +1395,6 @@ int test_boxed_union_invocations (Test * test_object) test_object->union_op4(p4->_boxed_in(), p5->_boxed_inout(), p6->_boxed_out()); - ACE_TRY_CHECK; OBV_VERITY (p5->_d () == 2); OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0); @@ -1513,12 +1498,12 @@ main (int argc, char *argv[]) ACE_TRY_EX (cleanup) { - test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (); ACE_TRY_CHECK_EX (cleanup); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (); ACE_TRY_CHECK_EX (cleanup); } ACE_CATCHANY diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 4eaa84c6db0..f650fa42a83 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -73,12 +69,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test_var test = test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,19 +84,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp index 5e1e673e8c3..e7a9e83d1bc 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp @@ -124,7 +124,6 @@ Service_Config_ORB_DLL::svc (void) int ret = this->worker_->test_main (this->argv_->argc (), this->argv_->argv () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %@ %s bows out - so long, cruel world! (%d)\n"), diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp index 97c8347258a..74f42b24826 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index 2ae4c53e2c6..5fb32ced93a 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -50,7 +50,6 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_Argv_Type_Converter cvt (argc, argv); CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (), cvt.get_ASCII_argv () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -68,7 +67,6 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_TRY { co = orb->string_to_object(ior_file_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (co == 0) { @@ -80,7 +78,6 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -94,15 +91,13 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n"))); CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) String returned from the server <%s>\n"), the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); attempts_left = 0; // We're done here! @@ -123,10 +118,8 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) } orb->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); return 0; } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index b1c130c6057..359a2a30d26 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -61,15 +61,12 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_Argv_Type_Converter cvt (argc, argv); CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (), cvt.get_ASCII_argv () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -77,8 +74,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0) return 1; @@ -92,24 +88,19 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) PortableServer::ObjectId_var id = root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var hello_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow (hello_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n"))); @@ -125,22 +116,18 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n"))); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n"))); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // During normal test execution the ORB would have been destroyed // by a request from the client. // orb->shutdown (0 ACE_ENV_ARG_PARAMETER); - // ACE_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); return 0; } diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index a1d4a89b03e..0952defe3b5 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -36,41 +36,33 @@ test_with_regular_poa_manager (int argc, { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (destroy_poa) { root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception raised"); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; @@ -91,44 +83,36 @@ test_with_funky_poa_manager (int argc, { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (funky_poa_manager) { PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } if (destroy_poa) { root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception raised"); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp index 345f699a8eb..189e571d126 100644 --- a/TAO/tests/ORB_init/ORB_init.cpp +++ b/TAO/tests/ORB_init/ORB_init.cpp @@ -32,7 +32,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; my_orb = orb.in (); @@ -49,7 +48,6 @@ main (int argc, char *argv[]) // ------------------------------------------------------------- orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a // pointer so we're okay. @@ -83,11 +81,9 @@ main (int argc, char *argv[]) // attempt to initialize a new ORB with the same ORBid. // ------------------------------------------------------------- - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a // pointer so we're okay. @@ -123,7 +119,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ------------------------------------------------------------- // Initialize another two ORBs but don't explicitly destroy them @@ -132,11 +127,9 @@ main (int argc, char *argv[]) // ------------------------------------------------------------- CORBA::ORB_var orb2 = CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb3 = CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ------------------------------------------------------------- // Now try to perform an operation using the destroyed ORB @@ -145,12 +138,10 @@ main (int argc, char *argv[]) // ORB itself break when the last ORB is released. // ------------------------------------------------------------- - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If we get here, then something went wrong. A // CORBA::OBJECT_NOT_EXIST() exception should have been thrown!. diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp index e93543879ed..e4c52394c25 100644 --- a/TAO/tests/ORB_init/Portspan/server.cpp +++ b/TAO/tests/ORB_init/Portspan/server.cpp @@ -10,30 +10,23 @@ main( int argc, char *argv[] ) CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - PortableServer::POAManager_var man = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POAManager_var man = poa->the_POAManager(); - man->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + man->activate(); simple_i simp; PortableServer::ObjectId_var objId = poa->activate_object(&simp ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run(); } ACE_CATCHANY diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index 1ab5469ae50..86c5b373b39 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -15,15 +15,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -31,8 +28,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Foo_Bar *foobar_impl; ACE_NEW_RETURN (foobar_impl, @@ -40,11 +36,9 @@ main (int argc, char *argv[]) 1); Test::Foo_var foo = - foobar_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + foobar_impl->_this (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Dont unscope it or move it elsewhere.. It is here with a // purpose. If you dont understand this, please re-read the @@ -58,23 +52,19 @@ main (int argc, char *argv[]) // Just run the ORB for a minute.. orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - shutting down the ORB\n")); orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Finished shutting down the ORB\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index 38fcec43f31..4c7152a2134 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -15,14 +15,14 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor (void) } char * -ORT_test_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ORT_IORInterceptor"); } void -ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->establish_count_ > 0 @@ -60,8 +60,7 @@ ORT_test_IORInterceptor::components_established ( // Save a copy of the current ObjectReferenceFactory. PortableInterceptor::ObjectReferenceFactory_var old_orf = - info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->current_factory (); PortableInterceptor::ObjectReferenceFactory * tmp; ACE_NEW_THROW_EX (tmp, @@ -71,13 +70,11 @@ ORT_test_IORInterceptor::components_established ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ObjectReferenceFactory_var orf = tmp; info->current_factory (orf.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index 14e17c49529..90e0dbc6d02 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -47,11 +47,11 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index 77797e82b0b..29ccff8e367 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -12,14 +12,14 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb) } CORBA::Boolean -ORT_test_i::request_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_i::request_server (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void -ORT_test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +ORT_test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h index 0046e1fce5a..582438e8795 100644 --- a/TAO/tests/ORT/ORT_test_i.h +++ b/TAO/tests/ORT/ORT_test_i.h @@ -26,10 +26,10 @@ public: ORT_test_i (CORBA::ORB_ptr orb); - virtual CORBA::Boolean request_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean request_server (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index 40853060d7b..ec5915d4aec 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -29,18 +29,15 @@ ServerORBInitializer::post_init ( CORBA::Object_var obj = info->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (poa_current.in ())); - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = info->orb_id (); // Create and register the test's ServerRequestInterceptor @@ -53,13 +50,11 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = tmp; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create and register the test's IORInterceptor @@ -72,12 +67,10 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInterceptor_var ior_interceptor = ort_test_interceptor; info->add_ior_interceptor (ior_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp index 904b4bda66f..567b82b7e8e 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.cpp +++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp @@ -19,14 +19,14 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -51,8 +51,7 @@ ServerRequestInterceptor::receive_request ( // shutdown operation. Don't bother displaying output a second // time. CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) return; @@ -61,8 +60,7 @@ ServerRequestInterceptor::receive_request ( ACE_TRY { - poa = this->poa_current_->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa = this->poa_current_->get_POA (); } ACE_CATCH (PortableServer::Current::NoContext, ex) { @@ -72,11 +70,9 @@ ServerRequestInterceptor::receive_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; PortableServer::POA_var parent_poa = - poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa->the_parent (); // Make sure there is more than one POA in the POA hierarchy since // the servant should have been registered with a child POA, not the @@ -84,8 +80,7 @@ ServerRequestInterceptor::receive_request ( ACE_ASSERT (!CORBA::is_nil (parent_poa.in ())); PortableInterceptor::AdapterName_var name = - ri->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->adapter_name (); ACE_DEBUG ((LM_INFO, @@ -117,13 +112,11 @@ ServerRequestInterceptor::receive_request ( // sequence. ACE_ASSERT (ACE_OS::strcmp ("RootPOA", name[(CORBA::ULong) 0]) == 0); - CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = ri->orb_id (); ACE_ASSERT (ACE_OS::strcmp (this->orb_id_.in (), orb_id.in ()) == 0); - CORBA::String_var server_id = ri->server_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var server_id = ri->server_id (); ACE_ASSERT (ACE_OS::strcmp (server_id.in (), "ORT_test_server") == 0); } diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index d46cf2612d3..0651e82cd10 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -65,10 +65,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index a1f0d2219a7..e62b995b750 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -41,19 +41,16 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ObjectReferenceTemplate::ORT_test_var server = ObjectReferenceTemplate::ORT_test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -64,14 +61,12 @@ main (int argc, char *argv[]) } CORBA::Boolean result = - server->request_server (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->request_server (); if (result == 0) ACE_DEBUG ((LM_DEBUG, "Successful invocation\n")); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp index d8656cc7c94..ae3b94a24cd 100644 --- a/TAO/tests/ORT/server.cpp +++ b/TAO/tests/ORT/server.cpp @@ -54,14 +54,12 @@ int main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "ORT Test ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; @@ -69,13 +67,11 @@ int main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check for nil references if (CORBA::is_nil (root_poa.in ())) @@ -85,12 +81,10 @@ int main (int argc, char *argv[]) // Get poa_manager reference PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Activate it. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies (0); policies.length (0); @@ -101,45 +95,38 @@ int main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var second_poa = first_poa->create_POA ("SECOND_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var third_poa = second_poa->create_POA ("THIRD_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var fourth_poa = third_poa->create_POA ("FOURTH_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ORT_test_i ort_test_impl (orb.in ()); PortableServer::ObjectId_var oid = fourth_poa->activate_object (&ort_test_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; obj = fourth_poa->servant_to_reference (&ort_test_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Convert the object reference to a string format. CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Dump it to a file. if (ior_output_file != 0) @@ -155,11 +142,9 @@ int main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 73ae41e115f..4cd15761689 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -20,26 +20,21 @@ Loader::create_object (CORBA::ORB_ptr orb, { CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var mgr = - poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->the_POAManager (); - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr->activate (); Test_i *test; ACE_NEW_RETURN (test, Test_i (poa.in ()), CORBA::Object::_nil ()); PortableServer::ServantBase_var tmp = test; - obj = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = test->_this (); return obj._retn (); } diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp index 6150714b0a5..008a4844bab 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -14,28 +14,25 @@ Test_i::Test_i (PortableServer::POA_ptr poa) } CORBA::Long -Test_i::instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::instance_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Test_i::instance_count_; } void -Test_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +Test_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -Test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 5fc58fc95cd..c1d920b2c7b 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -30,13 +30,13 @@ public: Test_i (PortableServer::POA_ptr poa); // ctor - CORBA::Long instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Long instance_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index e7e9b391e0d..aed3134c350 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -26,20 +26,16 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->string_to_object ("DLL:Test_Object" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var test = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long count = - test->instance_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->instance_count (); if (count != norbs*i + j + 1) { @@ -48,8 +44,7 @@ main (int, char *[]) "(%d != %d)\n", count, norbs * i + j + 1)); } - test->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->destroy (); } } @@ -61,22 +56,17 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } } ACE_CATCHANY diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 3fb96a60ce4..a2d2e6b3d38 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -45,7 +45,6 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) return -1; @@ -54,11 +53,9 @@ main (int argc, char *argv []) CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Server_var server = Server::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create object instances // This portion of the test was given by Petr Tuma and am just @@ -84,7 +81,6 @@ main (int argc, char *argv []) server->CreateExtra (iAddSize, vAddition.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; vServers->length (iSize); @@ -114,18 +110,15 @@ main (int argc, char *argv []) server->DeleteExtra (vServers.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown \n")); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); - ACE_CHECK_RETURN (-1); } ACE_ENDTRY; diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 3890ff162fb..773c9911ad2 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -21,7 +21,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -99,10 +99,8 @@ ServerServant::DeleteExtra (const ServerSequence &seq this->root_poa_->reference_to_servant (seq [cnt]); this->root_poa_->deactivate_object (oid.in ()); - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); + servant->_remove_ref (); } ACE_DEBUG ((LM_DEBUG, @@ -111,7 +109,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq } void -ServerServant::shutdown (ACE_ENV_SINGLE_ARG_DECL) +ServerServant::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -163,17 +161,14 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var vRootPOABase = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (vRootPOABase.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -181,8 +176,7 @@ main (int argc, char *argv []) 1); PortableServer::POAManager_ptr pRootPOAManager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Instantiate the server ServerServant *servant = 0; @@ -195,14 +189,12 @@ main (int argc, char *argv []) PortableServer::ServantBase_var owner_transfer(servant); Server_var server = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); // Announce the server CORBA::String_var obj_ref = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -214,19 +206,15 @@ main (int argc, char *argv []) ACE_OS::fprintf (output_file, "%s", obj_ref.in ()); ACE_OS::fclose (output_file); - pRootPOAManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + pRootPOAManager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index 995499aca20..0e3b1fed94d 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -170,7 +170,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int n = 64; int lo = 128; diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index e781734a4b2..267bf2256ec 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -61,18 +61,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Database_var server = Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -84,8 +81,7 @@ main (int argc, char *argv[]) #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::String_var repository_id = - server->_repository_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->_repository_id (); if (ACE_OS::strcmp (repository_id.in (), "IDL:Test/Database:1.0") != 0) { @@ -131,7 +127,6 @@ main (int argc, char *argv[]) token, returned_token ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (token != returned_token) { @@ -145,7 +140,6 @@ main (int argc, char *argv[]) CORBA::ULong crc_remote = server->get_crc (idx ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong crc_local = ACE::crc32 (elements[idx].get_buffer (), @@ -165,11 +159,9 @@ main (int argc, char *argv[]) } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index 59e56b30f2d..ecec923fba0 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -4,8 +4,8 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (OctetSeq, - server, +ACE_RCSID (OctetSeq, + server, "$Id$") const char *ior_output_file = "test.ior"; @@ -42,11 +42,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,11 +53,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ main (int argc, char *argv[]) 128); // @@ TODO Test::Database_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -91,20 +85,16 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index d0166961d72..ff91ed3cd51 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -56,7 +56,6 @@ Database_i::get (Test::Index i ACE_NEW_THROW_EX (copy, Test::OctetSeq (this->elements_[i]), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return copy; } @@ -73,7 +72,7 @@ Database_i::get_crc (Test::Index i } void -Database_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Database_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h index d5ca10aac21..f3f02bef367 100644 --- a/TAO/tests/OctetSeq/test_i.h +++ b/TAO/tests/OctetSeq/test_i.h @@ -47,7 +47,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp index 6e0195eff58..2304ac6c354 100644 --- a/TAO/tests/Ondemand_Write/Hello.cpp +++ b/TAO/tests/Ondemand_Write/Hello.cpp @@ -22,7 +22,7 @@ Hello::get_string ( } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h index 17f387990e2..2cd11fd1b71 100644 --- a/TAO/tests/Ondemand_Write/Hello.h +++ b/TAO/tests/Ondemand_Write/Hello.h @@ -24,7 +24,7 @@ public: const char * inputb) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp index e000950a65a..85546533fc5 100644 --- a/TAO/tests/Ondemand_Write/client.cpp +++ b/TAO/tests/Ondemand_Write/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -64,16 +61,13 @@ main (int argc, char *argv[]) CORBA::String_var test_string = CORBA::string_dup ("661234567890123456789012345678901234567890"); CORBA::String_var the_string = hello->get_string (5, test_string.in (), 6, test_string.in ()); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp index 177aad4d1d8..245c288e5c8 100644 --- a/TAO/tests/Ondemand_Write/server.cpp +++ b/TAO/tests/Ondemand_Write/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,19 +83,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index 9942c6020d6..4768a8bd14b 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -21,20 +21,20 @@ Oneway_Buffering::receive_data (const Test::Payload &the_payload } void -Oneway_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering::flush (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Oneway_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Buffering::sync (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); + this->admin_->flush (); } void -Oneway_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Buffering::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index c1cc0c5144b..b2b6764a311 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -22,13 +22,13 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (ACE_ENV_SINGLE_ARG_DECL) + virtual void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (ACE_ENV_SINGLE_ARG_DECL) + virtual void sync (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index a04178e6012..59af5adc056 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -13,14 +13,14 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb) } CORBA::ULong -Oneway_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::request_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong -Oneway_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; @@ -36,13 +36,13 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length } void -Oneway_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::flush (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Oneway_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Buffering_Admin::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index bf1a4dbbdde..80825e37778 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -17,20 +17,20 @@ public: Oneway_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong request_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_received (CORBA::ULong payload_length ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (ACE_ENV_SINGLE_ARG_DECL) + virtual void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index 4ab858a5e46..097b71236eb 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl); Test::Oneway_Buffering_Admin_var oneway_buffering_admin = - oneway_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_buffering_admin_impl->_this (); CORBA::String_var ior = orb->object_to_string (oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index 0c4383016ef..18617f80bbe 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -120,18 +120,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Oneway_Buffering_var oneway_buffering = Test::Oneway_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (oneway_buffering.in ())) { @@ -143,11 +140,9 @@ main (int argc, char *argv[]) tmp = orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Oneway_Buffering_Admin_var oneway_buffering_admin = Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (oneway_buffering_admin.in ())) { @@ -166,7 +161,6 @@ main (int argc, char *argv[]) oneway_buffering.in (), oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_timeout_test) { @@ -177,7 +171,6 @@ main (int argc, char *argv[]) oneway_buffering.in (), oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_timeout_reactive_test) { @@ -188,7 +181,6 @@ main (int argc, char *argv[]) oneway_buffering.in (), oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (run_buffer_size_test) { @@ -199,7 +191,6 @@ main (int argc, char *argv[]) oneway_buffering.in (), oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -207,14 +198,11 @@ main (int argc, char *argv[]) "ERROR: No test was configured\n")); } - oneway_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_buffering->shutdown (); ACE_OS::sleep(1); - oneway_buffering_admin->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_buffering_admin->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -236,11 +224,9 @@ configure_policies (CORBA::ORB_ptr orb, { CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy_current.in ())) { @@ -258,21 +244,16 @@ configure_policies (CORBA::ORB_ptr orb, orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[0]->destroy (); + policies[1]->destroy (); TAO::BufferingConstraint flush_constraint; flush_constraint.mode = TAO::BUFFER_FLUSH; @@ -286,20 +267,16 @@ configure_policies (CORBA::ORB_ptr orb, orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); object = oneway_buffering->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[0]->destroy (); flusher = Test::Oneway_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } @@ -309,14 +286,12 @@ sync_server (Test::Oneway_Buffering_ptr flusher ACE_ENV_ARG_DECL) { // Get back in sync with the server... - flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + flusher->flush (); + flusher->sync (); } int -run_liveness_test (CORBA::ORB_ptr orb, +run_liveness_test (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_ptr flusher, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin @@ -326,11 +301,9 @@ run_liveness_test (CORBA::ORB_ptr orb, int test_failed = 0; sync_server (flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong send_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); int liveness_test_iterations = int(send_count); @@ -343,16 +316,13 @@ run_liveness_test (CORBA::ORB_ptr orb, for (int i = 0; i != liveness_test_iterations; ++i) { oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Once the system has sent enough messages we don't // expect it to fall too far behind, i.e. at least 90% of the @@ -370,13 +340,11 @@ run_liveness_test (CORBA::ORB_ptr orb, i, receive_count, expected)); sync_server (flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } if (depth++ == LIVENESS_MAX_DEPTH) { sync_server (flusher ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); depth = 0; } @@ -403,7 +371,6 @@ run_message_count (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -417,11 +384,9 @@ run_message_count (CORBA::ORB_ptr orb, for (int i = 0; i != iterations; ++i) { sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -434,16 +399,13 @@ run_message_count (CORBA::ORB_ptr orb, while (1) { oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong iteration_count = send_count - initial_receive_count; @@ -477,12 +439,11 @@ run_message_count (CORBA::ORB_ptr orb, } int liveness_test_failed = - run_liveness_test (orb, + run_liveness_test (orb, oneway_buffering, flusher.in (), oneway_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -507,7 +468,6 @@ run_timeout (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -521,11 +481,9 @@ run_timeout (CORBA::ORB_ptr orb, for (int i = 0; i != iterations; ++i) { sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -539,16 +497,13 @@ run_timeout (CORBA::ORB_ptr orb, while (1) { oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -586,7 +541,6 @@ run_timeout (CORBA::ORB_ptr orb, flusher.in (), oneway_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -612,7 +566,6 @@ run_timeout_reactive (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -626,11 +579,9 @@ run_timeout_reactive (CORBA::ORB_ptr orb, for (int i = 0; i != iterations; ++i) { sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); if (initial_receive_count != send_count) { @@ -644,19 +595,16 @@ run_timeout_reactive (CORBA::ORB_ptr orb, for (int j = 0; j != 20; ++j) { oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); send_count++; } while (1) { CORBA::ULong receive_count = - oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -694,7 +642,6 @@ run_timeout_reactive (CORBA::ORB_ptr orb, flusher.in (), oneway_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; @@ -720,7 +667,6 @@ run_buffer_size (CORBA::ORB_ptr orb, configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (test_failed != 0) return test_failed; @@ -734,11 +680,9 @@ run_buffer_size (CORBA::ORB_ptr orb, for (int i = 0; i != iterations; ++i) { sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong initial_bytes_received = - oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->bytes_received_count (); if (initial_bytes_received != bytes_sent) { @@ -751,16 +695,13 @@ run_buffer_size (CORBA::ORB_ptr orb, while (1) { oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = - oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + oneway_buffering_admin->bytes_received_count (); ACE_Time_Value tv (0, 10 * 1000); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::ULong payload_delta = bytes_sent - initial_bytes_received; @@ -803,7 +744,6 @@ run_buffer_size (CORBA::ORB_ptr orb, flusher.in (), oneway_buffering_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (liveness_test_failed) test_failed = 1; diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 6997308857d..9bdfa92be29 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -47,15 +47,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -63,19 +60,16 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Oneway_Buffering_Admin_var admin = Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (admin.in ())) { @@ -93,12 +87,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl); Test::Oneway_Buffering_var oneway_buffering = - oneway_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_buffering_impl->_this (); CORBA::String_var ior = orb->object_to_string (oneway_buffering.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -110,19 +102,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 8f76444fb40..7834abc95ba 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -31,7 +31,6 @@ Client_Task::svc (void) this->sender_->send_ready_message (this->us_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index e33c63186f9..57a87124294 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -19,14 +19,13 @@ Receiver_i::~Receiver_i (void) CORBA::Long -Receiver_i::receive_call (ACE_ENV_SINGLE_ARG_DECL) +Receiver_i::receive_call (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping... \n")); - this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->sender_->ping (); return this->no_calls_++; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index a5f13e29217..cbd618db0a4 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -33,11 +33,11 @@ public: virtual ~Receiver_i (void); // = The skeleton methods - virtual CORBA::Long receive_call (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long receive_call (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_call_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 8ac983b0163..69a03bb0dbd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -38,8 +38,7 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver i < this->number_; ++i) { - receiver->receive_call (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + receiver->receive_call (); } } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 1d372a6707a..36dc35b5b95 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -41,7 +41,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp index db7a0b5a63a..ce64de12aba 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -23,7 +23,6 @@ Server_Task::svc (void) // run the test for at most 60 seconds... ACE_Time_Value tv (60, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 9d2b4cc90e8..ca2473dbf3e 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,11 +52,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -66,11 +62,9 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Sender_var sender = Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) { @@ -90,12 +84,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); Test::Receiver_var receiver = - receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + receiver_impl->_this (); // Activate poa manager - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Client_Task client_task (sender.in (), receiver.in (), @@ -107,7 +99,6 @@ main (int argc, char *argv[]) // Before creating threads we will let the sender know that we // will have two threads that would make invocations.. sender->active_objects ((CORBA::Short) 2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1) { @@ -124,8 +115,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Event Loop finished \n")); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 2c3131b2cda..f8bdf0d2bf3 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); Test::Sender_var sender = - sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sender_impl->_this (); CORBA::String_var ior = orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,8 +81,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (orb.in (), ACE_Thread_Manager::instance ()); @@ -102,10 +95,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp index fdbe14bcae0..9269b215a44 100644 --- a/TAO/tests/Optimized_Connection/oc_client.cpp +++ b/TAO/tests/Optimized_Connection/oc_client.cpp @@ -43,18 +43,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -65,17 +62,14 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCH (CORBA::TRANSIENT, e) { diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index a12ae327ee7..7fffa5a0c1b 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -32,13 +32,13 @@ public: test_i (PortableServer::POA_ptr poa); - void normal (ACE_ENV_SINGLE_ARG_DECL) + void normal (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void exceptional (ACE_ENV_SINGLE_ARG_DECL) + void exceptional (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void notexisting (ACE_ENV_SINGLE_ARG_DECL) + void notexisting (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -50,21 +50,21 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::normal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::normal (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing normal\n")); } void -test_i::exceptional (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::exceptional (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); } void -test_i::notexisting (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::notexisting (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); @@ -171,24 +171,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -197,31 +192,26 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Servant_Locator* servant_locator = new Servant_Locator(child_poa.in ()) ; child_poa->set_servant_manager (servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var objectID = PortableServer::string_to_ObjectId ("object"); @@ -230,12 +220,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (objectID.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var testObject = test::_narrow (objectREF.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; testObject->normal(); diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index cfb3e541f38..75a3fccd76d 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -35,29 +35,24 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object; object = orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::Current_var current = PortableServer::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s successful\n", @@ -70,7 +65,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp index 8c6b6e980bc..399e615c228 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.cpp +++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp @@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h index 8ee25ebc312..436fdfcd77f 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.h +++ b/TAO/tests/POA/Deactivate_Object/Hello.h @@ -17,7 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp index 13749603e33..c601d1dfb1f 100644 --- a/TAO/tests/POA/Deactivate_Object/server.cpp +++ b/TAO/tests/POA/Deactivate_Object/server.cpp @@ -14,15 +14,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -30,8 +27,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, @@ -40,29 +36,23 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke reference_to_servant(). Should retrieve servant. PortableServer::ServantBase_var servant = root_poa->reference_to_servant (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Assert correctness. ACE_ASSERT (hello_impl == servant.in()); root_poa->deactivate_object (new_obj_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp index d0de0aad007..4e858447ae1 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp @@ -34,8 +34,7 @@ test_get_servant_manager (PortableServer::POA_ptr poa) // Getting the servant manager should give a wrong policy exception // exception PortableServer::ServantManager_ptr servant_manager = - poa->get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->get_servant_manager (); ACE_UNUSED_ARG (servant_manager); } @@ -64,7 +63,6 @@ test_set_servant_manager (PortableServer::POA_ptr poa) // Setting the servant manager should give a wrong policy exception // exception poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::WrongPolicy, ex) { @@ -91,8 +89,7 @@ test_get_servant_with_no_set (PortableServer::POA_ptr poa) // Getting the default servant without one set whould give a NoServant // exception PortableServer::Servant servant = - poa->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->get_servant (); ACE_UNUSED_ARG (servant); } @@ -121,25 +118,20 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa PortableServer::ObjectId* id = root_poa->activate_object (&test ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount++; CORBA::Object_var object = root_poa->id_to_reference (*id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant = root_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount++; root_poa->deactivate_object (*id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount--; CORBA::ULong refcount = - test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test._refcount_value (); ACE_UNUSED_ARG (refcount); ACE_UNUSED_ARG (expected_refcount); @@ -159,24 +151,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the new POA. CORBA::PolicyList policies (3); @@ -186,19 +174,16 @@ main (int argc, char **argv) policies[0] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Id Uniqueness Policy. policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Servant Retention Policy. policies[2] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA to host default servant. ACE_CString name = "Default Servant"; @@ -207,7 +192,6 @@ main (int argc, char **argv) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy policies. for (CORBA::ULong i = 0; @@ -215,17 +199,14 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); } // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_reference_to_servant_active_object(root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test servant. test_i test; @@ -240,7 +221,6 @@ main (int argc, char **argv) // Register default servant. default_servant_poa->set_servant (&test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Create dummy id. @@ -251,13 +231,11 @@ main (int argc, char **argv) object = default_servant_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke id_to_servant(). Should retrieve default servant. PortableServer::ServantBase_var servant = default_servant_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Assert correctness. @@ -267,7 +245,6 @@ main (int argc, char **argv) servant = default_servant_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Assert correctness. @@ -278,16 +255,14 @@ main (int argc, char **argv) "Default_Servant test successful\n")); CORBA::ULong refcount = - test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test._refcount_value (); ACE_UNUSED_ARG (refcount); ACE_UNUSED_ARG (expected_refcount); ACE_ASSERT (expected_refcount == refcount); // Destroy the ORB. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -295,7 +270,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.h +++ b/TAO/tests/POA/EndpointPolicy/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp index 61d7e6af070..c2d1c7593ce 100644 --- a/TAO/tests/POA/EndpointPolicy/client.cpp +++ b/TAO/tests/POA/EndpointPolicy/client.cpp @@ -47,13 +47,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -69,7 +67,6 @@ main (int argc, char *argv[]) (bad_ior ? "fail" : "work"))); Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -80,8 +77,7 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); if (bad_ior) { @@ -91,8 +87,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "client: success!\n")); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { @@ -106,7 +101,7 @@ main (int argc, char *argv[]) } ACE_ENDTRY; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (); return 0; } diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 1471f38f8b3..835dfbc8b43 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -39,7 +39,7 @@ class test_i_with_reference_counting : public virtual POA_test { public: - void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -111,8 +111,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, delete servant; else { - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } } @@ -128,24 +127,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies (3); policies.length (3); @@ -154,29 +149,24 @@ main (int argc, char **argv) policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Create servant activator. PortableServer::ServantManager_var servant_manager = @@ -185,7 +175,6 @@ main (int argc, char **argv) // Set servant_activator as the servant_manager of child POA. child_poa->set_servant_manager (servant_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; { // Create a reference with user created ID in child POA which @@ -197,19 +186,15 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -222,19 +207,15 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -247,11 +228,9 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -264,15 +243,12 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid = child_poa->reference_to_id (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; child_poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, @@ -284,7 +260,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 7880507c3fa..b92532c9614 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -24,10 +24,10 @@ class test_i : public POA_test { public: - void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) + void deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); PortableServer::POA_var poa_; @@ -41,12 +41,11 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARA } void -test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->deactivate_object (this->id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Exception flag int expected_exception_raised = 0; @@ -55,7 +54,6 @@ test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) { this->poa_->deactivate_object (this->id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) { @@ -68,7 +66,6 @@ test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct type. ACE_ASSERT (expected_exception_raised); @@ -104,7 +101,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct // type. @@ -115,11 +111,9 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Reset flag expected_exception_raised = 0; @@ -141,7 +135,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct // type. @@ -150,7 +143,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant.poa_ = PortableServer::POA::_duplicate (poa); @@ -158,11 +150,9 @@ test_object_deactivation (PortableServer::POA_ptr poa, servant.id_ = id; test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant._this (); - test->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test->deactivate_self (); // ACE_ASSERT dissappears in non-debug builds ACE_UNUSED_ARG (expected_exception_raised); @@ -181,24 +171,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList empty_policies; PortableServer::POA_var child_poa = @@ -206,32 +192,26 @@ main (int argc, char **argv) poa_manager.in (), empty_policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); obj = root_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_object_deactivation (root_poa.in (), id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; id = PortableServer::string_to_ObjectId ("good id"); test_object_deactivation (child_poa.in (), id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -239,7 +219,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 1f3265ec6c4..28a88c7a4bb 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -30,7 +30,7 @@ public: { } - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -55,15 +55,12 @@ create_poas (PortableServer::POA_ptr root_poa, policies[0] = root_poa->create_lifespan_policy (lifespan_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the firstPOA ACE_CString name = "firstPOA"; @@ -71,14 +68,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[1]->destroy (); policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the secondPOA name = "secondPOA"; @@ -86,14 +80,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[2]->destroy (); policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the thirdPOA name = "thirdPOA"; @@ -101,14 +92,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[1]->destroy (); policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the forthPOA name = "forthPOA"; @@ -116,15 +104,13 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the new POAs over, so destroy the policies for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[i]->destroy (); } } @@ -143,42 +129,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; root_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = root_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = root_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -190,49 +168,40 @@ test_poas (CORBA::ORB_ptr orb, obj = root_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { root_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = root_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -241,32 +210,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = root_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = root_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -274,42 +237,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; first_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = first_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = first_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = first_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference .in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -321,24 +276,20 @@ test_poas (CORBA::ORB_ptr orb, first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { first_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = first_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -347,32 +298,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = first_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = first_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = first_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -380,42 +325,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; second_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = second_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = second_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = second_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -427,49 +364,40 @@ test_poas (CORBA::ORB_ptr orb, obj = second_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { second_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = second_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -478,32 +406,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = second_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = second_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = second_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -513,17 +435,14 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -533,27 +452,22 @@ test_poas (CORBA::ORB_ptr orb, third_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = third_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = third_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = third_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -565,26 +479,21 @@ test_poas (CORBA::ORB_ptr orb, obj = third_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_servant.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -593,24 +502,20 @@ test_poas (CORBA::ORB_ptr orb, third_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { third_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = third_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); third_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -621,17 +526,14 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -641,27 +543,22 @@ test_poas (CORBA::ORB_ptr orb, forth_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = forth_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = forth_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = forth_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -678,17 +575,14 @@ test_poas (CORBA::ORB_ptr orb, forth_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = forth_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); forth_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -702,17 +596,14 @@ main (int argc, char **argv) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters = TAO_ORB_Core_instance ()->server_factory ()->active_object_map_creation_parameters (); @@ -731,7 +622,6 @@ main (int argc, char **argv) third_poa.out (), forth_poa.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_poas (orb.in (), root_poa.in (), @@ -741,27 +631,22 @@ main (int argc, char **argv) forth_poa.in (), perform_deactivation_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; second_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; third_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; forth_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; create_poas (root_poa.in (), PortableServer::PERSISTENT, @@ -770,7 +655,6 @@ main (int argc, char **argv) third_poa.out (), forth_poa.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_poas (orb.in (), root_poa.in (), @@ -780,12 +664,10 @@ main (int argc, char **argv) forth_poa.in (), perform_deactivation_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -794,7 +676,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 11d740642cd..885007113bf 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -30,7 +30,7 @@ public: test_i (PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -42,7 +42,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -187,7 +187,6 @@ set_nil_servant_manager (PortableServer::POA_ptr poa) // minor code 4 poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJ_ADAPTER, ex) { @@ -222,7 +221,6 @@ overwrite_servant_manager (PortableServer::POA_ptr poa) // obj_adapter with minor code 6 poa->set_servant_manager (&servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) { @@ -257,24 +255,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -283,26 +276,22 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!set_nil_servant_manager (child_poa.in())) retval = -1; @@ -310,7 +299,6 @@ main (int argc, char **argv) Servant_Locator servant_locator (child_poa.in ()); child_poa->set_servant_manager (&servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!overwrite_servant_manager (child_poa.in())) retval = -1; @@ -322,12 +310,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (first_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var first_test = test::_narrow (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var second_oid = PortableServer::string_to_ObjectId ("second"); @@ -336,12 +322,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (second_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var second_test = test::_narrow (second_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; first_task.object (first_test.in ()); second_task.object (second_test.in ()); @@ -355,7 +339,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s successful\n", diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 70b54317789..ea08b02a671 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -31,7 +31,7 @@ public: ~test_i (void); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -54,7 +54,7 @@ test_i::~test_i (void) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -95,13 +95,11 @@ Object_Activator::svc (void) PortableServer::ObjectId_var id = this->poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->object_activated_.signal (); this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -162,11 +160,9 @@ Servant_Activator::incarnate (const PortableServer::ObjectId &, this->id_ = this->poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); this->poa_->deactivate_object (this->id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); int result = global_object_activator->activate (); @@ -212,8 +208,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } int @@ -226,24 +221,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -252,34 +242,28 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Servant_Activator servant_activator (child_poa.in ()); child_poa->set_servant_manager (&servant_activator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var first_object = child_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var first_test = test::_narrow (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var id = child_poa->reference_to_id (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Thread_Manager thread_manager; @@ -289,12 +273,10 @@ main (int argc, char **argv) global_object_activator = &object_activator; - first_test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + first_test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Wait for the Object_Activator thread to exit. thread_manager.wait (); @@ -302,7 +284,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index 11aa293619d..86d60cf1a65 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -51,18 +51,15 @@ test_i::~test_i (void) { ACE_TRY_NEW_ENV { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this->other_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n")); poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -83,27 +80,22 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_i *servant1 = new test_i (0); test_i *servant2 = new test_i (servant1); @@ -111,29 +103,23 @@ main (int argc, char **argv) PortableServer::ObjectId_var id1 = root_poa->activate_object (servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Give ownership to POA. - servant1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant1->_remove_ref (); PortableServer::ObjectId_var id2 = root_poa->activate_object (servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Give ownership to POA. - servant2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant2->_remove_ref (); root_poa->deactivate_object (id2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 0c5c38a7ddf..60682e114db 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -56,7 +56,7 @@ class test_i : public POA_test public: test_i (ACE_Auto_Event &event); - void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) + void deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -69,22 +69,19 @@ test_i::test_i (ACE_Auto_Event &event) } void -test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n")); poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n")); @@ -154,14 +151,12 @@ Activator::svc (void) PortableServer::ObjectId_var id = this->poa_->activate_object (this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { this->poa_->activate_object_with_id (this->id_, this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (debug) @@ -197,8 +192,7 @@ Deactivator::svc (void) { ACE_TRY_NEW_ENV { - this->test_->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->deactivate_self (); } ACE_CATCHANY { @@ -222,7 +216,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int parse_args_result = parse_args (argc, argv); @@ -234,21 +227,17 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Auto_Event event1; test_i servant1 (event1); @@ -256,19 +245,15 @@ main (int argc, char **argv) ACE_Auto_Event event2; test_i servant2 (event2); - test_var test_object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object1 = servant1._this (); - test_var test_object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object2 = servant2._this (); PortableServer::ObjectId_var id1 = root_poa->reference_to_id (test_object1.in ()); - ACE_TRY_CHECK; PortableServer::ObjectId_var id2 = root_poa->reference_to_id (test_object2.in ()); - ACE_TRY_CHECK; Activator activator1 (test_object1.in (), event1, @@ -302,7 +287,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -310,7 +294,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 349ad507854..b1969e4d810 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -80,7 +80,6 @@ main (int argc, char **argv) argv, "POAManagerFactoryTest" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -89,13 +88,11 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (verbose) ACE_DEBUG ((LM_DEBUG, @@ -126,7 +123,6 @@ main (int argc, char **argv) = poa_manager_factory->create_POAManager ("POAManager1", policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY_CONDITION (!CORBA::is_nil(poa_manager_1.in())); if (verbose) @@ -177,8 +173,7 @@ main (int argc, char **argv) ACE_ENV_ARG_PARAMETER); PortableServer::POAManager_var poa_manager_2 - = child_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = child_poa->the_POAManager (); VERIFY_CONDITION (!CORBA::is_nil(poa_manager_2.in())); if (verbose) @@ -189,8 +184,7 @@ main (int argc, char **argv) return 1; CORBA::String_var poa_manager_2_name - = poa_manager_2->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = poa_manager_2->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Implicitly created POAManager's ID: [%s]\n"), @@ -204,8 +198,7 @@ main (int argc, char **argv) pretest = fail; PortableServer::POAManagerFactory::POAManagerSeq_var managers - = poa_manager_factory->list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = poa_manager_factory->list (); VERIFY_CONDITION (managers->length () == 3); if (verbose) @@ -213,13 +206,11 @@ main (int argc, char **argv) (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); PortableServer::POAManager_var root_poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = root_poa->the_POAManager(); for (CORBA::ULong i = 0; i < managers->length(); ++i) { - CORBA::String_var name = managers[i]->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::String_var name = managers[i]->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Validate listed POAManager [%s]: "), @@ -256,10 +247,8 @@ main (int argc, char **argv) PortableServer::POAManager_var manager = poa_manager_factory->find ("POAManager1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::String_var name = manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::String_var name = manager->get_id (); VERIFY_CONDITION ((ACE_OS::strcmp (name.in (), "POAManager1") == 0 && manager.in () == poa_manager_1.in ())); @@ -280,10 +269,8 @@ main (int argc, char **argv) poa_manager_1.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager_1->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager_1->activate (); root_poa->destroy (1, 1); @@ -298,7 +285,6 @@ main (int argc, char **argv) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("POAManagerFactory %s\n"), (pretest == fail) ? ACE_TEXT ("succeeded") : ACE_TEXT ("failed"))); diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index a35208aa000..831234c8537 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -22,23 +22,21 @@ class test_i : public POA_test { public: - void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) + void destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; void -test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 0; poa->destroy (etherealize_objects, wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -53,35 +51,28 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_i servant; - test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object = servant._this (); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object->destroy_poa (); } ACE_CATCHANY { @@ -89,7 +80,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index 45519fdd154..0813be7b6b5 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -70,7 +70,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int parse_args_result = parse_args (argc, argv); @@ -80,40 +79,30 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test1 = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test1->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->method (); test_var test2 = - test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->create_POA (); - test2->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test2->method (); - test1->destroy_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->destroy_POA (); test_var test3 = - test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->create_POA (); - test2->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test2->method (); - test3->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test3->method (); if (shutdown_server) { - test1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->shutdown (); } } ACE_CATCHANY @@ -122,7 +111,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 15f8272c1a9..6ee388c43f1 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -31,19 +31,19 @@ public: test_i (CORBA::ORB_ptr orb_ptr, PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - test_ptr create_POA (ACE_ENV_SINGLE_ARG_DECL) + test_ptr create_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy_POA (ACE_ENV_SINGLE_ARG_DECL) + void destroy_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); protected: CORBA::ORB_var orb_; @@ -60,26 +60,22 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var poa = - current->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->get_POA (); CORBA::String_var poa_name = - poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa->the_name (); ACE_DEBUG ((LM_DEBUG, "Method invoked on servant in POA = %s\n", @@ -87,22 +83,21 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } test_ptr -test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) +test_i::create_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::PolicyList policies (2); @@ -111,16 +106,13 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) policies[0] = this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); policies[1] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); + this->poa_->the_POAManager (); ACE_CString name = "POA"; this->child_poa_ = @@ -128,15 +120,13 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); // Destroy the policies for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[i]->destroy (); } test_i *servant = @@ -150,30 +140,26 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) this->oid_ = this->child_poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); } else { this->child_poa_->activate_object_with_id (this->oid_.in (), servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); } test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); + servant->_this (); return test._retn (); } void -test_i::destroy_POA (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->child_poa_->destroy (1, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } const char *ior_file = "ior"; @@ -244,7 +230,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); if (result != 0) @@ -253,38 +238,31 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); test_i servant (orb.in (), root_poa.in ()); test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int write_result = write_ior_to_file (ior.in ()); if (write_result != 0) return write_result; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } ACE_CATCHANY { @@ -292,7 +270,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index 59db0b1e922..a1f067968ca 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -38,27 +38,22 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the POA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -66,7 +61,6 @@ main (int argc, char **argv) PortableServer::ThreadPolicy_var policy1 = root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::ORB_CTRL_MODEL; @@ -75,12 +69,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::THREAD_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ThreadPolicy_var policy2 = PortableServer::ThreadPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -91,7 +83,6 @@ main (int argc, char **argv) PortableServer::LifespanPolicy_var policy1 = root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::TRANSIENT; @@ -100,12 +91,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::LIFESPAN_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::LifespanPolicy_var policy2 = PortableServer::LifespanPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -114,7 +103,6 @@ main (int argc, char **argv) PortableServer::IdUniquenessPolicy_var policy1 = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::UNIQUE_ID; @@ -123,12 +111,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::ID_UNIQUENESS_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::IdUniquenessPolicy_var policy2 = PortableServer::IdUniquenessPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -137,7 +123,6 @@ main (int argc, char **argv) PortableServer::IdAssignmentPolicy_var policy1 = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::USER_ID; @@ -146,12 +131,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::ID_ASSIGNMENT_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::IdAssignmentPolicy_var policy2 = PortableServer::IdAssignmentPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -162,7 +145,6 @@ main (int argc, char **argv) PortableServer::ImplicitActivationPolicy_var policy1 = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::IMPLICIT_ACTIVATION; @@ -171,12 +153,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ImplicitActivationPolicy_var policy2 = PortableServer::ImplicitActivationPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -185,7 +165,6 @@ main (int argc, char **argv) PortableServer::ServantRetentionPolicy_var policy1 = root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::RETAIN; @@ -194,12 +173,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::SERVANT_RETENTION_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var policy2 = PortableServer::ServantRetentionPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -208,7 +185,6 @@ main (int argc, char **argv) PortableServer::RequestProcessingPolicy_var policy1 = root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY; @@ -217,12 +193,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::REQUEST_PROCESSING_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::RequestProcessingPolicy_var policy2 = PortableServer::RequestProcessingPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -240,7 +214,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index bd7b83a4082..37f8c315906 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -33,7 +33,7 @@ public: CORBA::ULong getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL) { - return sb->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); + return sb->_refcount_value (); } int @@ -43,15 +43,12 @@ main (int argc, char * argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,16 +58,13 @@ main (int argc, char * argv[]) Hello_impl * h = 0; ACE_NEW_RETURN (h,Hello_impl, 1); - CORBA::ULong before_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong before_act = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before activation: %d\n", before_act)); PortableServer::ObjectId_var oid = poa->activate_object (h ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::ULong after_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong after_act = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "After activation: %d\n", after_act)); { @@ -85,17 +79,14 @@ main (int argc, char * argv[]) */ CORBA::ULong refCountBeforeIdToServant = - h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before id_to_servant: %d\n", refCountBeforeIdToServant)); PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong refCountAfterIdToServant = - srv->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);; - ACE_TRY_CHECK; + srv->_refcount_value ();; ACE_DEBUG ((LM_DEBUG, "After id_to_servant: %d\n", refCountAfterIdToServant)); @@ -110,13 +101,11 @@ main (int argc, char * argv[]) */ } - CORBA::ULong before_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong before_deact = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before deactivate_object: %d\n", before_deact)); poa->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* * Because id_to_servant did not increment the reference count, but @@ -126,20 +115,16 @@ main (int argc, char * argv[]) * correct. */ - CORBA::ULong after_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong after_deact = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "After deactivate_object: %d\n", after_deact)); - h->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->_remove_ref (); orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index f841fcdfdfd..c1478b9964a 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -28,10 +28,10 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: PortableServer::POA_var poa_; @@ -45,7 +45,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -63,16 +63,14 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Calling self from %t\n")); - test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test_var self = this->_this (); - self->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + self->method (); } } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -97,8 +95,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->method (); } ACE_CATCHANY { @@ -120,23 +117,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the new POA. CORBA::PolicyList policies (2); @@ -145,12 +138,10 @@ main (int argc, char **argv) policies[0] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of the child POA. PortableServer::POA_var child_poa = @@ -158,28 +149,23 @@ main (int argc, char **argv) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy the policies for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_i servant1 (child_poa.in ()); test_i servant2 (child_poa.in ()); - test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var object1 = servant1._this (); - test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var object2 = servant2._this (); Worker worker1 (object1.in ()); Worker worker2 (object2.in ()); @@ -198,7 +184,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 8b945a68c1b..cc0249af4b4 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -21,7 +21,7 @@ class test_i : public POA_test { public: - void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) + void destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)); void test_poa (PortableServer::POA_ptr poa); @@ -36,7 +36,7 @@ test_i::test_poa (PortableServer::POA_ptr poa) } void -test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean etherealize_objects = 1; @@ -44,7 +44,6 @@ test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) this->poa_->destroy (etherealize_objects, wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr @@ -58,27 +57,22 @@ init_orb (int argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + poa_manager->activate (); return root_poa._retn (); } @@ -96,18 +90,15 @@ main (int argc, argv, "first ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var second_poa = init_orb (argc, argv, "second ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i servant; - test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object = servant._this (); int expected_exception_raised = 0; @@ -115,7 +106,7 @@ main (int argc, { servant.test_poa (first_poa.in ()); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); + test_object->destroy_poa (); ACE_TRY_CHECK_EX (first_poa); } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) @@ -129,7 +120,6 @@ main (int argc, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // Make sure an exception was raised and it was of the correct // type. @@ -140,11 +130,9 @@ main (int argc, servant.test_poa (second_poa.in ()); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object->destroy_poa (); first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -152,7 +140,6 @@ main (int argc, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp index bdf487d4a54..00b5e3bea3c 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp @@ -9,14 +9,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h index 0fbcc7a4ab6..244529328a9 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h @@ -19,10 +19,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp index ee7747bb1ca..b4855e16b19 100644 --- a/TAO/tests/Parallel_Connect_Strategy/client.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp @@ -45,14 +45,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_High_Res_Timer hrt; ACE_hrtime_t elapsed; @@ -62,7 +60,6 @@ main (int argc, char *argv[]) Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; hrt.stop(); hrt.elapsed_microseconds (elapsed); hrt.reset(); @@ -80,16 +77,14 @@ main (int argc, char *argv[]) } if (kill_server) { - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } else { ACE_DEBUG ((LM_DEBUG,"Starting invocation 1 - ")); hrt.start(); CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); hrt.stop(); hrt.elapsed_microseconds (elapsed); ACE_DEBUG ((LM_DEBUG, @@ -98,16 +93,14 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG,"Starting invocation 2 - ")); hrt.reset(); hrt.start(); - the_string = hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + the_string = hello->get_string (); hrt.stop(); hrt.elapsed_microseconds (elapsed); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("call completed in %d usec\n"), elapsed )); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp index 153aba883ff..9a63c03d52d 100644 --- a/TAO/tests/Parallel_Connect_Strategy/server.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp @@ -44,15 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,8 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -73,13 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,11 +88,9 @@ main (int argc, char *argv[]) CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -107,22 +99,17 @@ main (int argc, char *argv[]) else { adapter->bind ("pcs_test", ior.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 42d992cd65a..3ec22426a14 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -20,8 +20,8 @@ #include "any.h" #include "tao/debug.h" -ACE_RCSID (Param_Test, - any, +ACE_RCSID (Param_Test, + any, "$Id$") // ************************************************************************ @@ -58,8 +58,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) req->set_return_type (CORBA::_tc_any); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const CORBA::Any *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); } @@ -100,8 +97,7 @@ Test_Any::init_parameters (Param_Test_ptr objref ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cobj_ = objref->make_coffee (); this->reset_parameters (); return 0; @@ -280,7 +276,6 @@ Test_Any::run_sii_test (Param_Test_ptr objref this->inout_, this->out_.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index c15ba6afd10..80c2e892030 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -26,8 +26,8 @@ #include "ace/Get_Opt.h" -ACE_RCSID (Param_Test, - anyop, +ACE_RCSID (Param_Test, + anyop, "$Id$") int @@ -41,7 +41,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:"); int opt; @@ -98,14 +97,12 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - Param_Test_var param_test = + Param_Test_var param_test = TAO::Narrow_Utils<Param_Test>::unchecked_narrow ( obj.in (), _TAO_Param_Test_Proxy_Broker_Factory_function_pointer ); - ACE_TRY_CHECK; TAO_Stub *stub = param_test->_stubobj (); stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0"); @@ -120,7 +117,6 @@ main (int argc, char *argv[]) } CORBA::Boolean equiv = param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!equiv) { @@ -272,7 +268,7 @@ main (int argc, char *argv[]) any <<= *i; Param_Test::Fixed_Struct *o; - + if (!(any >>= o) || o->l != i->l || o->c != i->c @@ -288,7 +284,7 @@ main (int argc, char *argv[]) } any <<= i; - + if (!(any >>= o) || o->l != i->l || o->c != i->c @@ -312,7 +308,7 @@ main (int argc, char *argv[]) CORBA::LongSeq (len), -1); i->length (len); - + for (CORBA::ULong k = 0; k < len; ++k) { (*i)[k] = k; @@ -347,7 +343,7 @@ main (int argc, char *argv[]) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IDL Types"); return 1; } diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index 9c2b6ea098e..e2c78db7621 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_array_seq.h" -ACE_RCSID (Param_Test, - bd_array_seq, +ACE_RCSID (Param_Test, + bd_array_seq, "$Id$") const CORBA::ULong MAX_ARRAYSEQ_LEN = 1; @@ -60,8 +60,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_ArraySeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Bounded_ArraySeq *tmp; req->return_value () >>= tmp; @@ -69,13 +68,11 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_ArraySeq (*tmp); } @@ -139,7 +136,6 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index 44be6ed3932..ab5e6b1675c 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_long_seq.h" -ACE_RCSID (Param_Test, - bd_long_seq, +ACE_RCSID (Param_Test, + bd_long_seq, "$Id$") // ************************************************************************ @@ -57,8 +57,7 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Long_Seq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const Param_Test::Bounded_Long_Seq *tmp; req->return_value () >>= tmp; @@ -66,13 +65,11 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Long_Seq (*tmp); } @@ -126,7 +123,6 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 0faa3656552..0a286d8d2db 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_short_seq.h" -ACE_RCSID (Param_Test, - bd_short_seq, +ACE_RCSID (Param_Test, + bd_short_seq, "$Id$") // ************************************************************************ @@ -57,8 +57,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Short_Seq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Bounded_Short_Seq *tmp; req->return_value () >>= tmp; @@ -66,13 +65,11 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Short_Seq (*tmp); } @@ -131,7 +128,6 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index 5d542556fa8..b41de5b6c4f 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_str_seq.h" -ACE_RCSID (Param_Test, - bd_str_seq, +ACE_RCSID (Param_Test, + bd_str_seq, "$Id$") // ************************************************************************ @@ -58,8 +58,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Bounded_StrSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const Param_Test::Bounded_StrSeq *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StrSeq (*tmp); } @@ -124,7 +121,6 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index 149ac604a6a..5eacc3e879f 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_string.h" -ACE_RCSID (Param_Test, - bd_string, +ACE_RCSID (Param_Test, + bd_string, "$Id$") // ************************************************************************ @@ -69,8 +69,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_short_string); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); char *tmp; req->return_value () >>= CORBA::Any::to_string (tmp, 128); @@ -78,13 +77,11 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= CORBA::Any::to_string (tmp, 128); this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= CORBA::Any::to_string (tmp, 128); this->out_ = CORBA::string_dup (tmp); } @@ -137,7 +134,6 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref this->inout_, str_out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 1c2593b9f40..40dc7e39d00 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_struct_seq.h" -ACE_RCSID (Param_Test, - bd_struct_seq, +ACE_RCSID (Param_Test, + bd_struct_seq, "$Id$") const CORBA::ULong MAX_STRUCTSEQ_LEN = 1; @@ -60,8 +60,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_StructSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Bounded_StructSeq *tmp; req->return_value () >>= tmp; @@ -69,13 +68,11 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StructSeq (*tmp); } @@ -129,7 +126,6 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 16d32473b03..1dccf92056f 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -20,8 +20,8 @@ #include "bd_wstr_seq.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - bd_wstr_seq, +ACE_RCSID (Param_Test, + bd_wstr_seq, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Bounded_WStrSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const Param_Test::Bounded_WStrSeq *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_WStrSeq (*tmp); } @@ -124,7 +121,6 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index 30689ff028c..fea2cc669c6 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -20,8 +20,8 @@ #include "bd_wstring.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - bd_wstring, +ACE_RCSID (Param_Test, + bd_wstring, "$Id$") // ************************************************************************ @@ -70,8 +70,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_short_wstring); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::WChar *tmp; req->return_value () >>= CORBA::Any::to_wstring (tmp, 128); @@ -79,13 +78,11 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128); this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128); this->out_ = CORBA::wstring_dup (tmp); } @@ -138,7 +135,6 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref this->inout_, str_out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index ee1737e545f..358628f74a8 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -56,8 +56,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Big_Union); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Big_Union *tmp; req->return_value () >>= tmp; @@ -65,13 +64,11 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Big_Union (*tmp); } @@ -83,8 +80,7 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cobj_ = objref->make_coffee (); this->reset_parameters (); return 0; @@ -239,7 +235,6 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -303,17 +298,13 @@ Test_Big_Union::check_validity (void) return 0; Coffee::Desc_var in_desc = - in->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + in->description (); Coffee::Desc_var inout_desc = - inout->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + inout->description (); Coffee::Desc_var out_desc = - out->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + out->description (); Coffee::Desc_var ret_desc = - ret->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ret->description (); if (ACE_OS::strcmp (in_desc->name.in (), inout_desc->name.in ()) diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 33f7f961f40..281b11ae2e0 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -69,7 +69,6 @@ Param_Test_Client<T>::run_sii_test (void) // Initialize parameters for the test. int check = this->test_object_->init_parameters (this->param_test_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (check == -1) { @@ -99,7 +98,6 @@ Param_Test_Client<T>::run_sii_test (void) // make the call this->test_object_->run_sii_test (this->param_test_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // stop the timer. this->results_.stop_timer (); @@ -182,7 +180,6 @@ Param_Test_Client<T>::run_dii_test (void) // initialize parameters for the test int check = this->test_object_->init_parameters (this->param_test_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (check == -1) { @@ -209,7 +206,6 @@ Param_Test_Client<T>::run_dii_test (void) { req = this->param_test_->_request (opname ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (opt->debug ()) { @@ -220,7 +216,6 @@ Param_Test_Client<T>::run_dii_test (void) // Make the invocation, verify the result. this->test_object_->dii_req_invoke (req.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 0dd6c1199fe..4632ba15471 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -20,8 +20,8 @@ #include "complex_any.h" #include "tao/debug.h" -ACE_RCSID (Param_Test, - complex_any, +ACE_RCSID (Param_Test, + complex_any, "$Id$") const int LEVEL_2_LENGTH = 5; @@ -62,8 +62,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_any); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const CORBA::Any *tmp; req->return_value () >>= tmp; @@ -71,13 +70,11 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); } @@ -178,7 +175,6 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref this->inout_, this->out_.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 45a45f49b38..728caf2c685 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -79,7 +79,6 @@ Driver::init (int argc, char **argv) argv, "internet" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (opt->parse_args (argc, argv) == -1) @@ -93,7 +92,6 @@ Driver::init (int argc, char **argv) CORBA::Object_var temp = this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) ACE_ERROR_RETURN ((LM_ERROR, @@ -106,7 +104,6 @@ Driver::init (int argc, char **argv) this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -114,7 +111,6 @@ Driver::init (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -620,8 +616,7 @@ Driver::run (void) { if (opt->shutdown ()) { - this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->objref_->shutdown (); } } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 959d2459c07..1f9ac960769 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -65,20 +65,17 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req Param_Test::_tc_Ooops )); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + req->invoke (); req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; *o3->value () >>= this->out_; } @@ -236,7 +233,6 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req } } ACE_ENDTRY; - ACE_CHECK; } int @@ -268,7 +264,6 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (Param_Test::Ooops, ex) { diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index a8e5fe0f82a..09433669ad5 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "fixed_array.h" -ACE_RCSID (Param_Test, - fixed_array, +ACE_RCSID (Param_Test, + fixed_array, "$Id$") // ************************************************************************ @@ -54,8 +54,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_); req->set_return_type (Param_Test::_tc_Fixed_Array); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Fixed_Array_forany forany; req->return_value () >>= forany; @@ -63,13 +62,11 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= forany; Param_Test::Fixed_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Param_Test::Fixed_Array_forany out_any (this->out_); *arg3->value () >>= forany; Param_Test::Fixed_Array_copy (this->out_, forany.in ()); @@ -117,7 +114,6 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index 9447fbf88a1..39f02f728b5 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "fixed_struct.h" -ACE_RCSID (Param_Test, - fixed_struct, +ACE_RCSID (Param_Test, + fixed_struct, "$Id$") // ************************************************************************ @@ -53,8 +53,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req req->add_out_arg ("s3") <<= this->out_; req->set_return_type (Param_Test::_tc_Fixed_Struct); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Fixed_Struct *tmp; req->return_value () >>= tmp; @@ -62,13 +61,11 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = *tmp; } @@ -116,7 +113,6 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index 69b3f3e8f3a..a8fc22b04e7 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -18,8 +18,8 @@ #include "multdim_array.h" -ACE_RCSID (Param_Test, - multdim_array, +ACE_RCSID (Param_Test, + multdim_array, "$Id$") // ************************************************************************ @@ -57,8 +57,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Multdim_Array); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Multdim_Array_forany forany; @@ -67,13 +66,11 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= forany; Param_Test::Multdim_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); } @@ -144,7 +141,6 @@ Test_Multdim_Array::run_sii_test (Param_Test_ptr objref this->inout_.inout (), this->out_.inout () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index b48b8ef65ed..dadb75e9c1d 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -20,7 +20,7 @@ #include "nested_struct.h" ACE_RCSID (Param_Test, - nested_struct, + nested_struct, "$Id$") // ************************************************************************ @@ -57,8 +57,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Nested_Struct); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Nested_Struct *tmp; req->return_value () >>= tmp; @@ -66,13 +65,11 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) CORBA::NamedValue_ptr arg2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Nested_Struct (*tmp); } @@ -142,7 +139,6 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 4b0986404b4..4c4d1c7cf4a 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -20,7 +20,7 @@ #include "objref.h" ACE_RCSID (Param_Test, - objref, + objref, "$Id$") // ************************************************************************ @@ -54,8 +54,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req req->set_return_type (_tc_Coffee); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Coffee_ptr tmp; req->return_value () >>= tmp; @@ -63,13 +62,11 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = Coffee::_duplicate (tmp); } @@ -97,8 +94,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref ACE_OS::strcpy (msg_str, "make_cofee"); // first get a Coffee object - this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->in_ = objref->make_coffee (); // Get some index into Coffee_Flavor []. CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6); @@ -107,7 +103,6 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref // set the attribute of the object ACE_OS::strcpy (msg_str, "set coffee attribute"); this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object - ACE_TRY_CHECK; this->inout_ = Coffee::_nil (); this->out_ = Coffee::_nil (); @@ -139,7 +134,6 @@ Test_ObjRef::reset_parameters (void) { // set the attribute of the object this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -166,7 +160,6 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref this->inout_.inout (), this->out_.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -197,25 +190,21 @@ Test_ObjRef::check_validity (void) return 0; } Coffee::Desc_var in_desc = - this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->in_->description (); const char *in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->inout_->description (); const char *inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->out_->description (); const char *out = out_desc->name.in (); - Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var ret_desc = this->out_->description (); const char* ret = ret_desc->name.in (); @@ -260,32 +249,28 @@ Test_ObjRef::print_values (void) if (!CORBA::is_nil (this->in_.in ())) { in_desc = - this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->in_->description (); in = in_desc->name.in (); } if (!CORBA::is_nil (this->inout_.in ())) { inout_desc = - this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->inout_->description (); inout = inout_desc->name.in (); } if (!CORBA::is_nil (this->out_.in ())) { out_desc = - this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->out_->description (); out = out_desc->name.in (); } if (!CORBA::is_nil (this->ret_.in ())) { ret_desc = - this->ret_->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ret_->description (); ret = ret_desc->name.in (); } } @@ -295,7 +280,6 @@ Test_ObjRef::print_values (void) return; } ACE_ENDTRY; - ACE_CHECK; diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index c299f461a8a..444df058841 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -20,7 +20,7 @@ #include "objref_struct.h" ACE_RCSID (Param_Test, - objref_struct, + objref_struct, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Objref_Struct); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Objref_Struct *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Objref_Struct (*tmp); } @@ -90,15 +87,13 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref // Set the long member. this->in_.x = gen->gen_long (); - this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->in_.y = objref->make_coffee (); Coffee::Desc d; d.name = gen->gen_string (); this->in_.y->description (d ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->inout_->x = 0; @@ -148,7 +143,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -182,17 +176,13 @@ Test_Objref_Struct::check_validity (void) return 0; } - Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var s_in = this->in_.y->description (); - Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var s_out = this->out_->y->description (); - Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var s_inout = this->inout_->y->description (); - Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var s_ret = this->ret_->y->description (); if (ACE_OS::strcmp (s_in->name, s_out->name) != 0 || ACE_OS::strcmp (s_in->name, s_inout->name) != 0 @@ -237,9 +227,8 @@ Test_Objref_Struct::print_values (void) ACE_TRY { - Coffee::Desc_var s_in = - this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var s_in = + this->in_.y->description (); Coffee::Desc_var s_inout = new Coffee::Desc; Coffee::Desc_var s_out = new Coffee::Desc; @@ -250,20 +239,17 @@ Test_Objref_Struct::print_values (void) if (!CORBA::is_nil (this->out_->y.in ())) { - s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + s_out = this->out_->y->description (); } if (!CORBA::is_nil (this->inout_->y.in ())) { - s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + s_inout = this->inout_->y->description (); } if (!CORBA::is_nil (this->ret_->y.in ())) { - s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + s_ret = this->ret_->y->description (); } ACE_DEBUG ((LM_DEBUG, @@ -283,5 +269,4 @@ Test_Objref_Struct::print_values (void) "Test_Objref_Struct::print_values\n"); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index a1710fd8122..fbdf0f0a978 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -692,10 +692,10 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr -Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL) +Param_Test_i::make_coffee (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->obj_._this (); } // test for object references @@ -710,15 +710,13 @@ Param_Test_i::test_objref (Coffee_ptr o1, ACE_TRY { - Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee_var myobj = obj_._this (); if (!CORBA::is_nil (o2)) CORBA::release (o2); CORBA::Boolean equiv = myobj->_is_equivalent (o1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (equiv) { @@ -789,8 +787,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, if (TAO_debug_level > 0) { CORBA::TypeCode_var tc = a1.type (); - int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + int kind = tc->kind (); ACE_DEBUG ((LM_DEBUG, "Received any contents are <%d>\n", @@ -994,8 +991,7 @@ Param_Test_i::test_exception (CORBA::ULong s1, // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's // conversion of such an exception to UNKNOWN. - this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->throw_badboy (); return 0; } @@ -1067,14 +1063,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, } void -Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Param_Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } void -Param_Test_i::throw_badboy (ACE_ENV_SINGLE_ARG_DECL) +Param_Test_i::throw_badboy (void) { ACE_THROW (Param_Test::BadBoy ()); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 8f9307c3266..c35af9e5f29 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -31,7 +31,7 @@ public: // =methods for the attribute - virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL) + virtual Coffee::Desc * description (void) ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute @@ -241,7 +241,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr - make_coffee (ACE_ENV_SINGLE_ARG_DECL) + make_coffee (void) ACE_THROW_SPEC ((CORBA::SystemException)); // make a coffee object @@ -328,7 +328,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -339,7 +339,7 @@ private: Coffee_i obj_; // the coffee object reference we maintain - void throw_badboy (ACE_ENV_SINGLE_ARG_DECL); + void throw_badboy (void); // Called by test_exception. This will avoid the compiler // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 18d49fd2779..9117f8712ef 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -19,7 +19,7 @@ #include "recursive_struct.h" ACE_RCSID (Param_Test, - recursive_struct, + recursive_struct, "$Id$") const CORBA::ULong MAX_DEPTH = 5; @@ -58,8 +58,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Recursive_Struct); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Recursive_Struct *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Struct (*tmp); } @@ -129,7 +126,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index 5fc3c86506f..c636c7e7300 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -19,7 +19,7 @@ #include "recursive_union.h" ACE_RCSID (Param_Test, - recursive_union, + recursive_union, "$Id$") const CORBA::ULong MAX_DEPTH = 3; @@ -58,8 +58,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Recursive_Union); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Recursive_Union *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Union (*tmp); } @@ -131,7 +128,6 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index c66e703967f..fd3e41e0f40 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -67,7 +67,6 @@ main (int argc, char *argv[]) const char *orb_name = ""; CORBA::ORB_var orb_ptr = CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get // an object which we then have to narrow. @@ -76,7 +75,6 @@ main (int argc, char *argv[]) temp = orb_ptr->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,23 +82,19 @@ main (int argc, char *argv[]) 1); oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - oa_ptr->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oa_ptr->the_POAManager (); CORBA::PolicyList policies (2); policies.length (2); policies[0] = oa_ptr->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. @@ -109,7 +103,6 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse remaining command line and verify parameters. parse_args (argc, argv); @@ -128,19 +121,16 @@ main (int argc, char *argv[]) good_poa->activate_object_with_id (id.in (), param_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to // stdout. Someone will take that string and give it to a // client. Then release the object. temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var str = orb_ptr->object_to_string (temp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (TAO_debug_level > 0) { @@ -166,21 +156,17 @@ main (int argc, char *argv[]) // Make the POAs controlled by this manager active - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_ptr->run (); good_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; oa_ptr->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { @@ -193,7 +179,6 @@ main (int argc, char *argv[]) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // Free resources delete param_test; diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index adaa7219c30..5fe6e403958 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "short.h" -ACE_RCSID (Param_Test, - short, +ACE_RCSID (Param_Test, + short, "$Id$") // ************************************************************************ @@ -54,19 +54,16 @@ Test_Short::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_short); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= this->out_; } @@ -100,7 +97,6 @@ Test_Short::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index 81a771b66ea..bc59b246fd8 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -20,7 +20,7 @@ #include "small_union.h" ACE_RCSID (Param_Test, - small_union, + small_union, "$Id$") // ************************************************************************ @@ -56,8 +56,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Small_Union); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Small_Union *tmp; req->return_value () >>= tmp; @@ -65,13 +64,11 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Small_Union (*tmp); } @@ -83,8 +80,7 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cobj_ = objref->make_coffee (); this->reset_parameters (); return 0; @@ -140,7 +136,6 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref this->inout_, this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index 551ef486f39..3f35c5fcc6a 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -20,7 +20,7 @@ #include "typecode.h" ACE_RCSID (Param_Test, - typecode, + typecode, "$Id$") // ************************************************************************ @@ -54,8 +54,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_TypeCode); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::TypeCode_ptr tmp; req->return_value () >>= tmp; @@ -63,13 +62,11 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::TypeCode::_duplicate (tmp); } @@ -123,7 +120,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref ACE_TRY { this->init_parameters (objref ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::TypeCode_out out (this->out_); @@ -131,7 +127,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -156,15 +151,12 @@ Test_TypeCode::check_validity (void) one = this->in_.in ()->equal (this->inout_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; two = this->in_.in ()->equal (this->out_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; three = this->in_.in ()->equal (this->ret_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (one && two && three) return 1; diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index dd5277d5924..d059728a3cd 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -21,7 +21,7 @@ #include "tao/debug.h" ACE_RCSID (Param_Test, - ub_any_seq, + ub_any_seq, "$Id$") const CORBA::ULong TEST_SEQ_LENGTH = 5; @@ -62,8 +62,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_AnySeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::AnySeq* tmp; req->return_value () >>= tmp; @@ -71,13 +70,11 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new CORBA::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::AnySeq (*tmp); } @@ -126,8 +123,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref ACE_TRY { // get access to a Coffee Object - Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee_var cobj = objref->make_coffee (); // insert the coffee object into the Any this->in_[i] <<= cobj.in (); @@ -210,7 +206,6 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index 104c4885c74..a672933cecb 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "ub_array_seq.h" -ACE_RCSID (Param_Test, - ub_array_seq, +ACE_RCSID (Param_Test, + ub_array_seq, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_ArraySeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::ArraySeq *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::ArraySeq (*tmp); } @@ -140,7 +137,6 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index 32ef0cba131..fb026404ab5 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -20,7 +20,7 @@ #include "ub_long_seq.h" ACE_RCSID (Param_Test, - ub_long_seq, + ub_long_seq, "$Id$") // ************************************************************************ @@ -58,8 +58,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_LongSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::LongSeq *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::LongSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::LongSeq (*tmp); } @@ -120,7 +117,6 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index d15d6f0baac..247ddfaf5f2 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -20,7 +20,7 @@ #include "ub_objref_seq.h" ACE_RCSID (Param_Test, - ub_objref_seq, + ub_objref_seq, "$Id$") // ************************************************************************ @@ -68,8 +68,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Coffee_Mix); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Coffee_Mix *tmp; req->return_value () >>= tmp; @@ -77,13 +76,11 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Coffee_Mix (*tmp); } @@ -108,8 +105,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref { // generate some arbitrary string to be filled into the ith location in // the sequence - this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->in_[i] = objref->make_coffee (); // select a Coffee flavor at random CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6); @@ -120,7 +116,6 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref tmp->description (desc ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } return 0; @@ -156,7 +151,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -180,17 +174,14 @@ Test_ObjRef_Sequence::check_validity (void) this->compare (this->in_, this->inout_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->compare (this->in_, this->out_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->compare (this->in_, this->ret_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 1; } @@ -263,13 +254,11 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, return 0; } - Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var desc1 = vs1->description (); CORBA::String_var n1 = desc1->name.in (); - Coffee::Desc_var desc2 = vs2->description (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Coffee::Desc_var desc2 = vs2->description (); CORBA::String_var n2 = desc2->name.in (); diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index c7740c69fdb..9ade673571a 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -20,7 +20,7 @@ #include "ub_short_seq.h" ACE_RCSID (Param_Test, - ub_short_seq, + ub_short_seq, "$Id$") // ************************************************************************ @@ -58,8 +58,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_ShortSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::ShortSeq *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new CORBA::ShortSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::ShortSeq (*tmp); } @@ -122,7 +119,6 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 730701506f0..461de5233ba 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -20,7 +20,7 @@ #include "ub_str_seq.h" ACE_RCSID (Param_Test, - ub_str_seq, + ub_str_seq, "$Id$") // ************************************************************************ @@ -58,8 +58,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_StringSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::StringSeq *tmp; req->return_value () >>= tmp; @@ -67,13 +66,11 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new CORBA::StringSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::StringSeq (*tmp); } @@ -126,7 +123,6 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index 1392df320c0..a44252ce1f3 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -20,7 +20,7 @@ #include "ub_string.h" ACE_RCSID (Param_Test, - ub_string, + ub_string, "$Id$") // ************************************************************************ @@ -69,8 +69,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_string); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const char *tmp; req->return_value () >>= tmp; @@ -78,13 +77,11 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::string_dup (tmp); } @@ -138,7 +135,6 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref this->inout_, str_out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 805ecf71579..49db2cf09d9 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -20,7 +20,7 @@ #include "ub_struct_seq.h" ACE_RCSID (Param_Test, - ub_struct_seq, + ub_struct_seq, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_StructSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::StructSeq *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StructSeq (*tmp); } @@ -123,7 +120,6 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } @@ -266,8 +262,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_PathSpec); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::PathSpec *tmp; req->return_value () >>= tmp; @@ -275,13 +270,11 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::PathSpec (*tmp); } @@ -328,7 +321,6 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index e082cc19817..379e35214e0 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -21,7 +21,7 @@ #include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, - ub_wstr_seq, + ub_wstr_seq, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_WStringSeq); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); CORBA::WStringSeq *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new CORBA::WStringSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::WStringSeq (*tmp); } @@ -122,7 +119,6 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index a74134ff06b..0adb35e7ebe 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -21,7 +21,7 @@ #include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, - ub_wstring, + ub_wstring, "$Id$") // ************************************************************************ @@ -70,8 +70,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_wstring); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); const CORBA::WChar *tmp; req->return_value () >>= tmp; @@ -79,13 +78,11 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::wstring_dup (tmp); } @@ -138,7 +135,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref this->inout_, str_out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index d8104652da1..cdd06db2f10 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -20,7 +20,7 @@ #include "ulonglong.h" ACE_RCSID (Param_Test, - ulonglong, + ulonglong, "$Id$") Test_ULongLong::Test_ULongLong (void) @@ -50,19 +50,16 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_ulonglong); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= this->out_; } @@ -97,7 +94,6 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref this->out_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index f07192921e5..aee46a70b8a 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -20,7 +20,7 @@ #include "var_array.h" ACE_RCSID (Param_Test, - var_array, + var_array, "$Id$") // ************************************************************************ @@ -56,8 +56,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Var_Array); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Var_Array_forany forany; @@ -66,13 +65,11 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= forany; Param_Test::Var_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= forany; this->out_ = Param_Test::Var_Array_dup (forany.in ()); } @@ -115,7 +112,6 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref this->inout_, out_arr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index 679ed7b3db3..7b944bded68 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -20,7 +20,7 @@ #include "var_struct.h" ACE_RCSID (Param_Test, - var_struct, + var_struct, "$Id$") // ************************************************************************ @@ -59,8 +59,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Var_Struct); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Var_Struct *tmp; req->return_value () >>= tmp; @@ -68,13 +67,11 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Var_Struct (*tmp); } @@ -145,7 +142,6 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref this->inout_.inout (), out ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp index 21fbd5409bd..48d075e99f2 100644 --- a/TAO/tests/Permanent_Forward/StubTest.cpp +++ b/TAO/tests/Permanent_Forward/StubTest.cpp @@ -75,10 +75,8 @@ static bool marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfile *other_mprofile) { CORBA::String_var str = orb->object_to_string (obj ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj_copy = orb->string_to_object (str.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Stub *stub_copy = obj_copy->_stubobj (); TAO_MProfile *copy_mprofile = &(stub_copy->base_profiles ()); @@ -102,11 +100,9 @@ static void test_forward_permanent (CORBA::ORB_ptr orb) { CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // the permanent profile CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub4 = obj4->_stubobj (); @@ -149,19 +145,14 @@ static void test_forward_permanent_mix (CORBA::ORB_ptr orb) { CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj5 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:5555,iiop:192.168.1.3:5555/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub2 = obj2->_stubobj (); @@ -265,13 +256,10 @@ static void test_forward (CORBA::ORB_ptr orb) { CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub2 = obj2->_stubobj (); @@ -344,7 +332,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_forward (orb.in()); test_forward_permanent (orb.in()); diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index d3f78ece1b0..149250464a4 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -87,7 +87,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -95,13 +94,11 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var test = TAO::Narrow_Utils<Test>::unchecked_narrow ( object.in (), _TAO_Test_Proxy_Broker_Factory_function_pointer); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -213,7 +210,6 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy = this->orb_->create_policy (policy_type, any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE; if (operation == ADD_OBJECT_POLICY @@ -234,7 +230,6 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, this->test_->_set_policy_overrides (policy_list, override_type ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (operation == ADD_CURRENT_POLICY || operation == SET_CURRENT_POLICY) @@ -242,7 +237,6 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy_current->set_policy_overrides (policy_list, override_type ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -251,24 +245,20 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy_manager->set_policy_overrides (policy_list, override_type ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[0]->destroy (); } else if (operation == SAVE_CURRENT_POLICIES) { CORBA::PolicyTypeSeq types; policies = policy_current->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (operation == SAVE_MANAGER_POLICIES) { CORBA::PolicyTypeSeq types; policies = policy_manager->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (operation == RESTORE_CURRENT_POLICIES) { @@ -277,7 +267,6 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy_current->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } else // operation == RESTORE_MANAGER_POLICIES) @@ -287,7 +276,6 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy_manager->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } } @@ -314,20 +302,16 @@ Manipulation::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (int i = 0; i != this->niterations_; ++i) @@ -338,7 +322,6 @@ Manipulation::svc (void) policy_manager.in (), policy_current.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index ed90dd7815f..a3217d6afac 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -30,14 +30,14 @@ Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -71,13 +71,11 @@ Echo_Client_Request_Interceptor::send_request ( ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -101,7 +99,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -126,7 +123,6 @@ Echo_Client_Request_Interceptor::receive_other ( IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h index f775ebe2052..0c529129019 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h @@ -25,11 +25,11 @@ public: static unsigned long other_count; static unsigned long exception_count; - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp index 46ecb32ca03..533658d299d 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp @@ -34,5 +34,4 @@ Client_ORBInitializer::post_init ( info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp index 677ebee90b9..4a33052b676 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp @@ -23,7 +23,7 @@ Echo::echo_operation(char const * the_input } void -Echo::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index de20793bbde..4a8b656ee82 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -20,7 +20,7 @@ public: virtual char * echo_operation(char const * the_input ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 3dc6be77b96..88bd3501fc2 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -34,7 +34,7 @@ Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder * } void -Echo_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Handler::shutdown (void) ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index 76517aa76f2..c3860e22125 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -23,7 +23,7 @@ public: virtual void echo_operation_excep(::Messaging::ExceptionHolder * h ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown_excep(::Messaging::ExceptionHolder * h ACE_ENV_ARG_DECL) diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 4e8e110e4cd..923d6db7f04 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -22,14 +22,14 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,8 +42,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; @@ -51,7 +50,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (sc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h index 6ccb824bc8a..1b81b12e20c 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h @@ -20,10 +20,10 @@ class Echo_Server_Request_Interceptor public: Echo_Server_Request_Interceptor (); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index dc409dd644e..6d8e323a9b8 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -36,5 +36,4 @@ Server_ORBInitializer::post_init ( info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp index 571ccf476a0..4d4f046509d 100644 --- a/TAO/tests/Portable_Interceptors/AMI/client.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp @@ -59,12 +59,10 @@ main (int argc, char *argv[]) new Client_ORBInitializer); PortableInterceptor::register_orb_initializer (initializer.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +70,10 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -85,19 +81,15 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_var echo = Test::Echo::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (CORBA::is_nil (echo.in ())) { @@ -109,18 +101,14 @@ main (int argc, char *argv[]) test_synchronous (echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_ami (orb.in (), echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - echo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + echo->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); unsigned long request_count = Echo_Client_Request_Interceptor::request_count; @@ -174,7 +162,6 @@ test_synchronous (Test::Echo_ptr echo CORBA::String_var s = echo->echo_operation ("dummy message" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } unsigned long total_request_count = @@ -216,8 +203,7 @@ test_ami (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_echo_handler = echo_handler_impl; echo_handler = - echo_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + echo_handler_impl->_this (); unsigned long initial_request_count = Echo_Client_Request_Interceptor::request_count; @@ -230,7 +216,6 @@ test_ami (CORBA::ORB_ptr orb, echo_handler.in (), "dummy message" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } unsigned long total_request_count = @@ -256,13 +241,11 @@ test_ami (CORBA::ORB_ptr orb, while (echo_handler_impl->replies () != ITERATIONS) { CORBA::Boolean pending = - orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb->work_pending (); if (pending) { - orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb->perform_work (); } } @@ -291,7 +274,6 @@ wait_for_exception (CORBA::ORB_ptr orb, { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; bool exception_detected = false; @@ -302,7 +284,6 @@ wait_for_exception (CORBA::ORB_ptr orb, CORBA::String_var dummy = echo->echo_operation ("foo" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -313,7 +294,6 @@ wait_for_exception (CORBA::ORB_ptr orb, tv = ACE_Time_Value (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /*if 0*/ diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 0c52ac89b18..9d32157f46e 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -50,20 +50,16 @@ main (int argc, char *argv[]) new Server_ORBInitializer); PortableInterceptor::register_orb_initializer(initializer.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,8 +67,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +79,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(echo_impl); Test::Echo_var echo = - echo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + echo_impl->_this (); CORBA::String_var ior = orb->object_to_string (echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -101,19 +94,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 1a1256f6ad7..2e1f0fc57dc 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -124,7 +124,7 @@ public: virtual void send_reply (ServerRequestInfo_ptr ri) throw (SystemException) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "number") != 0) return; // Don't mess with PICurrent if not invoking test method. diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 4cad9dde31b..841c4b7a76e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -63,11 +63,9 @@ Client_ORBInitializer::post_init ( break; } } - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index 5ab4c2336d5..d39ee932251 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -65,11 +65,9 @@ Server_ORBInitializer::post_init ( break; } } - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index a874f7d3121..e1b14bb4e51 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -70,8 +70,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->ready (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->ready (); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -81,7 +80,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server now - latency_base, 1); - ACE_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } @@ -99,7 +97,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_hrtime_t latency_base = ACE_OS::gethrtime (); server->authenticate (user ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -119,7 +116,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_DEBUG ((LM_DEBUG, "Invalid user\n")); } ACE_ENDTRY; - ACE_CHECK; Test_Interceptors::Secure_Vault::Record record; record.check_num = 1; @@ -137,7 +133,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server server->update_records (id, record ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -147,7 +142,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server now - latency_base, 3); - ACE_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); @@ -195,23 +189,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -227,10 +217,8 @@ main (int argc, char *argv[]) // the same method is intercepted by different interceptors // wanting to achieve different functionality. run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index 0086a292ed7..dd6919fcd4a 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -24,14 +24,14 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor () } char * -Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,8 +53,7 @@ Vault_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { @@ -73,14 +72,12 @@ Vault_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -98,14 +95,12 @@ Vault_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -129,17 +124,14 @@ Vault_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -202,7 +194,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( ACE_NEW_THROW_EX (buf, CORBA::Octet [string_len], CORBA::NO_MEMORY ()); - ACE_CHECK; ACE_OS::strcpy (reinterpret_cast<char *> (buf), passwd); @@ -210,7 +201,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -240,17 +230,14 @@ Vault_Client_Request_Context_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -303,14 +290,12 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); const char *user; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -321,8 +306,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -340,15 +324,13 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -357,8 +339,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -382,17 +363,14 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -414,7 +392,7 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor () } char * -Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_NOOP_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -473,17 +451,14 @@ Vault_Client_Request_NOOP_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index 75f8d621f40..7fa620e29d5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -31,11 +31,11 @@ public: virtual ~Vault_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -76,11 +76,11 @@ public: virtual ~Vault_Client_Request_Context_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -121,11 +121,11 @@ public: virtual ~Vault_Client_Request_Dynamic_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -166,11 +166,11 @@ public: virtual ~Vault_Client_Request_NOOP_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index c556aed2940..32cc8cdce8f 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -57,18 +57,15 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -76,35 +73,28 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Secure_Vault: <%s>\n", @@ -123,13 +113,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index a11b66691d3..8bb4a1e9aec 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -24,14 +24,14 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor () } char * -Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,15 +54,13 @@ Vault_Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -74,8 +72,7 @@ Vault_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -93,14 +90,12 @@ Vault_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -174,7 +169,6 @@ Vault_Server_Request_Context_Interceptor::receive_request ( IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -244,14 +238,12 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); const char *user; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -262,8 +254,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -291,14 +282,12 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -306,8 +295,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -344,7 +332,7 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor () } char * -Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_NOOP_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 3adc2fe8424..3f4c6cf9a3f 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -31,11 +31,11 @@ public: ~Vault_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -78,11 +78,11 @@ public: ~Vault_Server_Request_Context_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -125,11 +125,11 @@ public: ~Vault_Server_Request_Dynamic_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -172,11 +172,11 @@ public: ~Vault_Server_Request_NOOP_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index f94c81f5efd..486c503d03c 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -13,7 +13,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) // ctor CORBA::Short -Secure_Vault_i::ready (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Secure_Vault_i::ready (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; @@ -40,7 +40,7 @@ return 1; } void -Secure_Vault_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Secure_Vault_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 1e91333a22d..e6b182888f5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -27,7 +27,7 @@ public: Secure_Vault_i (CORBA::ORB_ptr orb); // ctor - virtual CORBA::Short ready (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short ready (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void authenticate (const char * user @@ -41,7 +41,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index fd053e810f0..4ce9d465ca0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -28,8 +28,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -38,13 +37,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index b5590a28f3b..030ab3b4969 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -31,14 +31,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index 09231faacf2..f834c28a8f0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -41,30 +41,26 @@ run_test (Test_Interceptors::Visual_ptr server { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -72,7 +68,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -90,22 +85,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -116,10 +107,8 @@ main (int argc, char *argv[]) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index a9ea659b832..01b87c1d099 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -29,14 +29,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -63,20 +63,16 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -90,7 +86,6 @@ Echo_Client_Request_Interceptor::send_request ( ACE_TRY_NEW_ENV { ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, error) { @@ -121,12 +116,10 @@ Echo_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -162,12 +155,10 @@ Echo_Client_Request_Interceptor::send_request ( sc.context_data.replace (string_len, string_len, buf, 1); // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -201,20 +192,16 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -227,7 +214,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -245,7 +231,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -276,15 +261,12 @@ Echo_Client_Request_Interceptor::receive_other ( this->orb_id_.in ()); } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_other from " @@ -296,7 +278,6 @@ Echo_Client_Request_Interceptor::receive_other ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -325,18 +306,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -349,7 +326,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -367,7 +343,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h index 2503a4b75b7..5ee9a220c42 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp index 35f0c3ada75..7ff16a1cdaa 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -52,16 +52,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,14 +67,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -87,7 +81,6 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a second object to receive forwarded requests Visual_i forward_server_impl (orb.in ()); @@ -95,12 +88,10 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var forward_id = root_poa->activate_object (&forward_server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var forward_test_obj = root_poa->id_to_reference (forward_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Echo_Server_Request_Interceptor * server_interceptor = temp_initializer->server_interceptor (); @@ -113,21 +104,17 @@ main (int argc, char *argv[]) server_interceptor->forward_reference (forward_test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -146,13 +133,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index 7739e548ed1..ffb42ec8d1c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -47,14 +47,14 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -67,8 +67,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -86,7 +85,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -114,7 +112,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -144,8 +141,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_reply from \"%s\"\n", @@ -155,7 +151,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -173,7 +168,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -196,8 +190,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_exception from \"%s\"\n", @@ -207,7 +200,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -225,7 +217,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -247,8 +238,7 @@ Echo_Server_Request_Interceptor::send_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_other from \"%s\"\n", @@ -258,7 +248,6 @@ Echo_Server_Request_Interceptor::send_other ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -278,8 +267,7 @@ Echo_Server_Request_Interceptor::send_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h index 81924ce2902..f23ef1915ca 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h @@ -37,11 +37,11 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 503c7a5b423..a7839f0a2cd 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,8 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index 5a6df58c457..fbe117ea5d2 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -32,17 +32,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp index 2b3ff3f6fbb..9fd546f0552 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -31,15 +31,12 @@ main (int argc, char *argv[]) { PortableInterceptor::register_orb_initializer (initializer_var1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::register_orb_initializer (initializer_var2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::NO_MEMORY, ex) diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index acceb91568b..5d8a1d77a55 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -35,14 +35,12 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_UNUSED_ARG (slot_id); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index db5aab77b1d..87b8b09a27f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -36,14 +36,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index b95896c27ad..cd8cbf79b2e 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -43,15 +43,13 @@ static ACE_THR_FUNC_RETURN run_test(void* pData) ACE_TRY { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ex, "Exception thrown in run_test()\n"); } ACE_ENDTRY; - ACE_CHECK; - + return (ACE_THR_FUNC_RETURN)0; } @@ -70,22 +68,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -97,7 +91,7 @@ main (int argc, char *argv[]) ACE_hthread_t threadHandle; if ( ACE_Thread::spawn( run_test, - static_cast<void*>(server.in()), + static_cast<void*>(server.in()), THR_NEW_LWP | THR_JOINABLE , 0, & threadHandle @@ -107,10 +101,8 @@ main (int argc, char *argv[]) } ACE_Thread::join (threadHandle); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY @@ -119,7 +111,7 @@ main (int argc, char *argv[]) "Caught exception in client:"); return 1; } - + ACE_ENDTRY; return 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index b4f1e4e37cb..a1e13028d77 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,12 +53,10 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ())); @@ -74,7 +72,6 @@ Echo_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -84,12 +81,10 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ())); } @@ -101,11 +96,9 @@ Echo_Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ())); } @@ -117,11 +110,9 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ())); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h index 95c3e21346f..d1a4ed1b491 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 74e0c0a7227..93ebd9098d9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -55,11 +55,9 @@ main (int argc, char *argv[]) // Now create an ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,14 +66,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -85,21 +80,17 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -118,13 +109,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index 60b8e2eb1d2..1edf05d2a24 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -20,14 +20,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -57,7 +56,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -82,7 +80,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( { ri->set_slot (slotId, data); ACE_DEBUG ((LM_DEBUG, "receive_request_service_contexts filled Slot %d\n",(int)slotId)); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -90,7 +87,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h index f6af5ee88c2..938dfc12486 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 2686a6bfa70..1dd810a18be 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -26,8 +26,8 @@ Visual_i::normal (CORBA::Long arg CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (piobj.in () ); - - if (CORBA::is_nil (pi_current.in ())) + + if (CORBA::is_nil (pi_current.in ())) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Unable to obtain PICurrent reference\n")); throw CORBA::INTERNAL(); @@ -44,10 +44,9 @@ Visual_i::normal (CORBA::Long arg throw; } ACE_ENDTRY; - ACE_CHECK; const char *str = 0; - if (! (retrieved_any.in() >>= str) ) + if (! (retrieved_any.in() >>= str) ) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Problem extracting data from CORBA::Any\n")); throw CORBA::INTERNAL(); @@ -59,9 +58,8 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index bda46fa2346..14457ef6443 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -31,7 +31,7 @@ public: void normal (CORBA::Long arg ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index aa829e678f1..f0cd31d306f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 1aaceae2c8c..42262eb0f72 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -62,7 +62,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = @@ -70,7 +69,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -94,7 +92,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -109,8 +106,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); CORBA::ULong number_called = Echo_Server_Request_Interceptor::server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp index 879b3549b22..bb9107f608d 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp @@ -22,8 +22,7 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) { @@ -34,14 +33,12 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) { @@ -52,14 +49,12 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index a9db6a71b8a..32cca3aa9dc 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) PortableServer::ObjectId_var id = root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,13 +81,11 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 907a3e1193f..e60a822c7a6 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -26,14 +26,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -58,8 +58,7 @@ Echo_Client_Request_Interceptor::send_request ( client_interceptor_check_++; CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -75,8 +74,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::receive_other ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -119,8 +116,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -132,8 +128,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -144,8 +139,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -153,8 +147,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -177,12 +170,10 @@ Echo_Client_Request_Interceptor::receive_exception ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -204,14 +195,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -234,12 +225,10 @@ Echo_Server_Request_Interceptor::receive_request ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -248,8 +237,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -263,8 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -279,8 +266,7 @@ Echo_Server_Request_Interceptor::send_reply ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -289,8 +275,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -304,8 +289,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -313,8 +297,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -335,8 +318,7 @@ Echo_Server_Request_Interceptor::send_exception ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -345,13 +327,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 244270d4a37..133ed9e49be 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -33,11 +33,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( @@ -86,11 +86,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 949bea21eb6..38c49820914 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -30,7 +30,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -38,7 +38,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -46,11 +46,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp index c068138c6b8..c1459691f7f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp @@ -24,11 +24,9 @@ Client_Task::svc (void) { CORBA::Object_var obj = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -39,13 +37,10 @@ Client_Task::svc (void) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); this->corb_->destroy(); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -63,27 +58,23 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -91,5 +82,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp index b53c358a387..10431febe8b 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp @@ -24,8 +24,7 @@ Collocated_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) { @@ -36,14 +35,12 @@ Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) @@ -55,14 +52,12 @@ Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp index 27644baab31..51d75958ed9 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp @@ -63,7 +63,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); @@ -72,7 +71,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; @@ -97,7 +95,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp index e25f9e30637..68a1d93a219 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp @@ -25,12 +25,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,11 +36,9 @@ Server_Task::svc (void) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Visual_i *vi = 0; ACE_NEW_RETURN (vi, Visual_i (sorb_.in ()), 1); @@ -51,21 +47,17 @@ Server_Task::svc (void) PortableServer::ObjectId_var id = root_poa->activate_object (server_impl.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (output_ != 0) @@ -83,18 +75,15 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb_->run (); struct timespec ts = {0,250000000}; // quarter second ACE_OS::nanosleep (&ts); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server task - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index 58260168b5e..d0d5cbf3137 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -60,19 +60,15 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -94,12 +90,10 @@ Echo_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -129,20 +123,16 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -157,7 +147,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -176,7 +165,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -196,7 +184,6 @@ Echo_Client_Request_Interceptor::receive_reply ( "ERROR: Service Context Error \n")); } ACE_ENDTRY; - ACE_CHECK; } void @@ -224,18 +211,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -250,7 +233,6 @@ Echo_Client_Request_Interceptor::receive_exception ( IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -269,7 +251,6 @@ Echo_Client_Request_Interceptor::receive_exception ( IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -289,7 +270,6 @@ Echo_Client_Request_Interceptor::receive_exception ( "ERROR: Service Context Error \n")); } ACE_ENDTRY; - ACE_CHECK; } Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) @@ -303,14 +283,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -322,8 +302,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.receive_request_service_contexts from " @@ -334,7 +313,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -364,7 +342,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -385,8 +362,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.send_reply from \"%s\"\n", @@ -396,7 +372,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -414,7 +389,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -437,8 +411,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.send_exception from \"%s\"\n", @@ -448,7 +421,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -466,7 +438,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h index 29904bf2b55..961ce20f095 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h @@ -30,11 +30,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -82,11 +82,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index 0b76048e39b..deeae26c4eb 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,12 +45,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - // this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - // ACE_CHECK; + // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index 76a767d6a6a..8859d26f954 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -30,17 +30,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index e67eb2afb3c..2f92cf250c0 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -32,14 +32,12 @@ Echo_Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index cdb8f91338e..dfec81cec41 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -32,14 +32,12 @@ Echo_Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c3d906faeb3..68a5a30416e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -48,21 +48,18 @@ run_test (Test_Interceptors::Visual_ptr server server->normal (10, msg.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", result)); Test_Interceptors::Visual::VarLenStruct_var v = - server->the_structure (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->the_structure (); ACE_DEBUG ((LM_DEBUG, "the_structure() result is:\n" @@ -73,19 +70,17 @@ run_test (Test_Interceptors::Visual_ptr server ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -93,7 +88,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -113,23 +107,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -141,8 +131,7 @@ main (int argc, char *argv[]) run_test (server.in () ACE_ENV_ARG_PARAMETER); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 40b8274fa4e..88b6fe3dba5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,8 +54,7 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request from " @@ -67,8 +66,7 @@ Echo_Client_Request_Interceptor::send_request ( "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); if (paramlist->length () != 2) { @@ -108,8 +106,7 @@ Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " @@ -124,8 +121,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " @@ -137,8 +133,7 @@ Echo_Client_Request_Interceptor::receive_reply ( "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); if (paramlist->length () != 2) { @@ -187,8 +182,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -196,8 +190,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -210,8 +203,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0) { - CORBA::Any_var a = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var a = ri->result (); Test_Interceptors::Visual::VarLenStruct * v; @@ -234,8 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -244,8 +235,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index d2de8b3455a..b351476113d 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -28,11 +28,11 @@ public: Echo_Client_Request_Interceptor (void); // ctor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 2197bc560bb..7d2035f72e5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -55,16 +55,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -73,14 +70,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -90,21 +84,17 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -121,13 +111,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 3e1cf79ca24..232d5be21c4 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,8 +53,7 @@ Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -63,8 +62,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -78,8 +76,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -93,8 +90,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -103,8 +99,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -118,8 +113,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -127,8 +121,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -148,8 +141,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -158,13 +150,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index f536de965c0..d838e0abcd8 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -27,11 +27,11 @@ public: Echo_Server_Request_Interceptor (void); // cotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 80c51203166..5abcc564b62 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -33,7 +33,7 @@ Visual_i::calculate (CORBA::Long one, } Test_Interceptors::Visual::VarLenStruct * -Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::the_structure (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Test_Interceptors::Visual::VarLenStruct * s; @@ -41,7 +41,6 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (s, Test_Interceptors::Visual::VarLenStruct, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); Test_Interceptors::Visual::VarLenStruct_var safe_s = s; @@ -52,7 +51,7 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); @@ -60,7 +59,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -68,7 +67,7 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index b174c34a422..b1cb9244297 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -35,13 +35,13 @@ public: ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void user (ACE_ENV_SINGLE_ARG_DECL) + virtual void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - virtual void system (ACE_ENV_SINGLE_ARG_DECL) + virtual void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 4845a04bed7..812695fba5f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -28,11 +28,9 @@ Client_ORBInitializer::post_init ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = info->orb_id (); - CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::StringSeq_var args = info->arguments (); CORBA::String_var forward_str; @@ -55,14 +53,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index 949746c9d36..b2ab0ceba8c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -28,7 +28,7 @@ Client_Request_Interceptor::name ( } void -Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -43,8 +43,7 @@ Client_Request_Interceptor::send_request ( ++this->request_count_; CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -61,18 +60,15 @@ Client_Request_Interceptor::send_request ( 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::Object_var forward = this->orb_->string_to_object (this->forward_str_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var forward_str = this->orb_->object_to_string (forward.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "CLIENT (%P|%t) Request %d will be forwarded " @@ -119,16 +115,14 @@ Client_Request_Interceptor::receive_other ( { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); // Oneway if (!response_expected) return; PortableInterceptor::ReplyStatus reply_status = - ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->reply_status (); if (reply_status == PortableInterceptor::TRANSPORT_RETRY) return; @@ -140,8 +134,7 @@ Client_Request_Interceptor::receive_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index b39c5ae1297..f285ebbb668 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -65,10 +65,10 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index af8304f1cbb..cb1393d02a5 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -40,13 +40,11 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->server_interceptor_ = interceptor; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableInterceptor::ServerRequestInterceptor_ptr diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 10ad41353cf..0ad95fa4a28 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -40,14 +40,14 @@ Server_Request_Interceptor::forward_references ( } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); @@ -64,8 +64,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( this->request_count_++; CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -99,8 +98,7 @@ Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -155,8 +153,7 @@ Server_Request_Interceptor::send_other ( PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -167,8 +164,7 @@ Server_Request_Interceptor::send_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 382097c50a0..46264e65e30 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -79,10 +79,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index c04cfbaf890..111fed0e3c4 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -67,14 +67,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; @@ -84,11 +82,9 @@ main (int argc, char *argv[]) // this test. CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ForwardRequestTest::test_var server = ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -114,9 +110,8 @@ main (int argc, char *argv[]) if (i > 1) old_number = number; - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); + number = server->number (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "CLIENT: Request %d handled by object %d.\n", @@ -143,8 +138,7 @@ main (int argc, char *argv[]) } } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 286a18b98c0..1864fcda68d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -73,16 +73,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -91,11 +88,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (::parse_args (argc, argv) != 0) return -1; @@ -110,21 +105,17 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj1 = first_poa->servant_to_reference (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior1 = orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 1: <%s>\n", @@ -138,28 +129,23 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = second_poa->activate_object (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = second_poa->servant_to_reference (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior2 = orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 2: <%s>\n", ior2.in ())); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); #if TAO_HAS_INTERCEPTORS == 1 // Set the forward references in the server request interceptor. @@ -169,7 +155,6 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (interceptor.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -180,7 +165,6 @@ main (int argc, char *argv[]) interceptor->forward_references (obj1.in (), obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ // Write each IOR to a file. @@ -207,14 +191,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index adafe5be28d..122324ab774 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -18,14 +18,14 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 51c142c2de3..8b1d8091b62 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,11 +37,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index 2bf02d1ef30..6d44d1f9fa9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -25,7 +25,7 @@ FOO_ClientRequestInterceptor::name ( } void -FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_ClientRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -43,7 +43,6 @@ FOO_ClientRequestInterceptor::send_request ( IOP::TaggedComponent_var component = ri->get_effective_component (FOO::COMPONENT_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // The correct tagged component appears to exist. Display the // contents of the component data, which should be a NULL terminated @@ -72,7 +71,6 @@ FOO_ClientRequestInterceptor::send_request ( this->codec_->decode_value (data, CORBA::_tc_string ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char * name = 0; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index abe9074a545..74b07c85d0f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index f999b2f22bb..b759201cbc9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -24,8 +24,7 @@ FOO_Client_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = - info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->codec_factory (); // Set up a structure that contains information necessary to // create a GIOP 1.2 CDR encapsulation Codec. @@ -38,7 +37,6 @@ FOO_Client_ORBInitializer::post_init ( IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -48,12 +46,10 @@ FOO_Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index c29013285ff..ebb1c1342cc 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -14,14 +14,14 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec) } char * -FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_IORInterceptor"); } void -FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -38,8 +38,7 @@ FOO_IORInterceptor::establish_components ( // does the right thing, and ignores any IOR interceptors that throw // an exception. - CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var name = this->name (); CORBA::Any data; data <<= name.in (); @@ -47,7 +46,6 @@ FOO_IORInterceptor::establish_components ( CORBA::OctetSeq_var encoded_data = this->codec_->encode_value (data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Construct a tagged component. IOP::TaggedComponent component; @@ -69,7 +67,6 @@ FOO_IORInterceptor::establish_components ( // Add the tagged component to all profiles. info->add_ior_component (component ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -81,7 +78,6 @@ FOO_IORInterceptor::establish_components ( info->add_ior_component_to_profile (component, IOP::TAG_INTERNET_IOP ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -96,7 +92,6 @@ FOO_IORInterceptor::establish_components ( CORBA::Policy_var policy = info->get_effective_policy (PortableServer::THREAD_POLICY_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Successfully retrieved effective policy.\n")); @@ -107,7 +102,6 @@ FOO_IORInterceptor::establish_components ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } void @@ -148,7 +142,6 @@ FOO_IORInterceptor::components_established ( } } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (PROFILE) { @@ -176,7 +169,6 @@ FOO_IORInterceptor::components_established ( } } ACE_ENDTRY; - ACE_CHECK; } void diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 4fc980070d1..a7367fdaf18 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -59,11 +59,11 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 1930da1d6b0..9fe9a63e57c 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -25,8 +25,7 @@ FOO_IORInterceptor_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = - info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->codec_factory (); // Set up a structure that contains information necessary to // create a GIOP 1.2 CDR encapsulation Codec. @@ -39,7 +38,6 @@ FOO_IORInterceptor_ORBInitializer::post_init ( IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::IORInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -49,12 +47,10 @@ FOO_IORInterceptor_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInterceptor_var ior_interceptor = foo; info->add_ior_interceptor (ior_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index a482b81963e..a20429818ac 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -54,23 +54,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FOO::test_var server = FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -80,8 +76,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index a91cf021548..d12fa9eb8a0 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -57,7 +57,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -65,16 +64,13 @@ main (int argc, char *argv[]) argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,23 +78,19 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return -1; test_i server_impl (orb.in ()); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); FOO::test_var server = FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,7 +100,6 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -126,14 +117,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); // The interceptors will be destroyed when we call this - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index ecdb6b3560f..e966d06dfd9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index a712ff5c8d7..d21f3a0833f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,7 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp index 04262d84180..7d48da494f9 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp @@ -39,14 +39,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp index d7cd081e6d3..9b0bc3c203a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -21,14 +21,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_called_ = true; diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h index 10e3add572b..8989ac20ec8 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index ca70543c315..3cd19949ccb 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -48,7 +48,6 @@ main (int argc, char *argv[]) argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; @@ -56,11 +55,9 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var server = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -70,11 +67,9 @@ main (int argc, char *argv[]) 1); } - server->hello (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->hello (); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 000fda92d76..4fa0a28f4eb 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -56,16 +56,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -74,14 +71,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (::parse_args (argc, argv) != 0) return -1; @@ -89,13 +83,11 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); CORBA::Object_var obj = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "test servant: <%s>\n", @@ -113,14 +105,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_ASSERT (destroy_called == true); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index 8e96015a4c1..02d6b0dc13a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -16,14 +16,14 @@ test_i::~test_i (void) } void -test_i::hello (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::hello (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Hello!\n")); } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h index 4ada828b0c2..f05d76ad2e1 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h @@ -36,11 +36,11 @@ public: ~test_i (void); /// Say hello. - virtual void hello (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void hello (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp index 425c916436e..f6d8025d7ea 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp @@ -32,12 +32,10 @@ ClientORBInitializer::post_init ( CORBA::Object_var obj = info->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -47,8 +45,7 @@ ClientORBInitializer::post_init ( ACE_THROW (CORBA::INTERNAL ()); } - ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ::slot_id = info->allocate_slot_id (); PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -59,12 +56,10 @@ ClientORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index 66a253f3074..a6e1556eb00 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -28,7 +28,7 @@ ClientRequestInterceptor::name ( } void -ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ ClientRequestInterceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -54,7 +53,6 @@ ClientRequestInterceptor::send_request ( CORBA::Any_var data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data.in () >>= number)) { @@ -79,7 +77,6 @@ ClientRequestInterceptor::send_request ( this->pi_current_->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the RSC again. It should not have // changed! @@ -88,7 +85,6 @@ ClientRequestInterceptor::send_request ( CORBA::Any_var data2 = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data2.in () >>= number2) || number != number2) @@ -114,7 +110,6 @@ ClientRequestInterceptor::send_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Client side RSC/TSC semantics appear " diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index c4709fff0a6..fe070a88325 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 5eae8540505..32918295488 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -25,7 +25,7 @@ ClientRequestInterceptor2::name ( } void -ClientRequestInterceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor2::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -37,8 +37,7 @@ ClientRequestInterceptor2::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_you") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -57,7 +56,6 @@ ClientRequestInterceptor2::send_request ( CORBA::Any_var data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data.in () >>= number)) { @@ -86,7 +84,6 @@ ClientRequestInterceptor2::send_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) RSC->TSC->RSC copying appears to be working.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index cfca53a52d6..1007a757f19 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -56,10 +56,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index daa05dfb4ad..d05c9d84a28 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -29,12 +29,10 @@ ServerORBInitializer::post_init ( CORBA::Object_var obj = info->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -44,8 +42,7 @@ ServerORBInitializer::post_init ( ACE_THROW (CORBA::INTERNAL ()); } - ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ::slot_id = info->allocate_slot_id (); PortableInterceptor::ServerRequestInterceptor_ptr server_tmp; ACE_NEW_THROW_EX (server_tmp, @@ -56,14 +53,12 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = server_tmp; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr client_tmp; ACE_NEW_THROW_EX (client_tmp, @@ -73,14 +68,12 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = client_tmp; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Disable collocation -- TAO-specific!!! // @@ -91,7 +84,6 @@ ServerORBInitializer::post_init ( TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; tao_info->orb_core ()->optimize_collocation_objects (0); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index a76d1d5b774..0a9ae728408 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -20,14 +20,14 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -56,7 +55,6 @@ ServerRequestInterceptor::receive_request_service_contexts ( data <<= number; ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Inserted number <%d> into RSC.\n", @@ -75,7 +73,6 @@ ServerRequestInterceptor::receive_request_service_contexts ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; } void @@ -95,14 +92,12 @@ ServerRequestInterceptor::receive_request ( ri->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the TSC again. It should not have // changed to the new value CORBA::Any_var data2 = this->pi_current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long number2 = 0; if ((data2.in () >>= number2) @@ -128,7 +123,6 @@ ServerRequestInterceptor::receive_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " @@ -143,8 +137,7 @@ ServerRequestInterceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -158,7 +151,6 @@ ServerRequestInterceptor::send_reply ( // stored into the RSC by the receive_request_service_contexts() // interception point. data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The original data in the RSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -193,14 +185,12 @@ ServerRequestInterceptor::send_reply ( this->pi_current_->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the RSC again. It should not have // changed! CORBA::Any_var data2 = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *str2 = 0; if (!(data2.in () >>= str2) @@ -226,7 +216,6 @@ ServerRequestInterceptor::send_reply ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index b9cd7bf2c5d..73cd1a8156f 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -59,10 +59,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 2cd36a5cd9c..8ac95bdcd71 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -55,14 +55,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -71,12 +69,10 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -97,16 +93,13 @@ main (int argc, char *argv[]) pi_current->set_slot (::slot_id, data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Resolve the target object, and perform the invocation. obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PICurrentTest::test_var server = PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -138,13 +131,11 @@ main (int argc, char *argv[]) } } - server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->invoke_me (); CORBA::Any_var new_data = pi_current->get_slot (::slot_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The original data in the TSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -166,15 +157,12 @@ main (int argc, char *argv[]) ACE_TRY_THROW (CORBA::INTERNAL ()); } - server->invoke_we (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->invoke_we (); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_OS::sleep(1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 46f5cde72a1..e73136104f3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -60,22 +60,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,21 +79,17 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return -1; obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,13 +100,11 @@ main (int argc, char *argv[]) ::slot_id, orb.in ()); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); PICurrentTest::test_var server = PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -124,7 +114,6 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ())); @@ -142,12 +131,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_OS::sleep(1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index 453c16429aa..8de999831ae 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -20,7 +20,7 @@ test_i::~test_i (void) } void -test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) +test_i::invoke_me (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -44,8 +44,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) // By this point all of step 1 has occurred. Step 2 will now // occur. PICurrentTest::test_var my_ref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); // ---------------------------------------------------- @@ -59,7 +58,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) retrieved_any = this->current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) { @@ -80,7 +78,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) "Unexpected exception\n"); } ACE_ENDTRY; - ACE_CHECK; CORBA::Long retrieved; if (retrieved_any.in() >>= retrieved) @@ -102,8 +99,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) // (ClientRequestInterceptor2) to be invoked. This assumes that // DIRECT collocation (and possibly THRU_POA collocation) is // disabled. - my_ref->invoke_you (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + my_ref->invoke_you (); // ---------------------------------------------------- @@ -135,7 +131,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -143,7 +138,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::invoke_you (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Nothing to be tested here. This method is here just so that we @@ -151,7 +146,7 @@ test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) +test_i::invoke_we (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Insert some data into the TSC PICurrent object. @@ -182,7 +177,6 @@ test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -190,7 +184,7 @@ test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index c9de94d10a0..02c15fffba3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -41,21 +41,21 @@ public: ~test_i (void); /// Main servant test method. - virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_me (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoke_you (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_you (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Test just a set slot - virtual void invoke_we (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_we (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index 5c9cae1b492..135f9cdcab6 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -18,14 +18,14 @@ IORInterceptor::~IORInterceptor (void) } char * -IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (""); } void -IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->success_); @@ -40,12 +40,10 @@ IORInterceptor::establish_components ( ACE_TRY { PortableInterceptor::ObjectReferenceTemplate_var t = - info->adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + info->adapter_template (); PortableInterceptor::AdapterName_var a = - t->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + t->adapter_name (); // Only execute if POA is not RootPOA. The RootPOA will not // have our custom policy, but the child POA we created will. @@ -54,12 +52,10 @@ IORInterceptor::establish_components ( CORBA::Policy_var policy ( info->get_effective_policy (Test::POLICY_TYPE ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; Test::Policy_var test_policy (Test::Policy::_narrow ( policy.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; this->success_ = true; } @@ -73,6 +69,5 @@ IORInterceptor::establish_components ( ACE_ASSERT (false); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index c2ab7cf6602..bec8aef5eec 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -58,11 +58,11 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp index 5c9266495e9..f8838b1e9f4 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp @@ -19,34 +19,33 @@ Policy::~Policy (void) } CORBA::ULong -Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::PolicyType -Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Test::POLICY_TYPE; } CORBA::Policy_ptr -Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Policy_ptr p; ACE_NEW_THROW_EX (p, Policy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return p; } void -Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h index 834e8918745..2843358dcbd 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h @@ -36,16 +36,16 @@ public: Policy (CORBA::ULong val); /// Test method defined in test IDL. - virtual CORBA::ULong value (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index 495bc24a325..ba0fdfa6fb4 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -30,7 +30,6 @@ PolicyFactory::create_policy (CORBA::PolicyType type, ACE_NEW_THROW_EX (p, Policy (val), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return p; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp index e6369e699fa..0dc54c1a7ae 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp @@ -37,14 +37,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory (p); info->register_policy_factory (Test::POLICY_TYPE, policy_factory.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::IORInterceptor_ptr i; ACE_NEW_THROW_EX (i, @@ -54,11 +52,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInterceptor_var ior_interceptor (i); info->add_ior_interceptor (ior_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp index 1a52aa6b982..5dad3cfbb8e 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -29,13 +29,11 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the test policy. @@ -46,11 +44,9 @@ main (int argc, char *argv[]) CORBA::Policy_var p (orb->create_policy (Test::POLICY_TYPE, any ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; const CORBA::PolicyType ptype = - p->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + p->policy_type (); // Sanity check. if (ptype != Test::POLICY_TYPE) @@ -58,10 +54,8 @@ main (int argc, char *argv[]) Test::Policy_var policy (Test::Policy::_narrow (p.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; - const CORBA::ULong pval = policy->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const CORBA::ULong pval = policy->value (); // Sanity check. if (val != pval) @@ -70,12 +64,10 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,33 +75,26 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies (1); policies.length (1); - policies[0] = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0] = policy->copy (); PortableServer::POA_var poa = root_poa->create_POA ("Test POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_INFO, "\n" diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index fca62b6fe50..d55a7d9e5c2 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp index 41d8c39fec7..fd0619dcc12 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp @@ -134,7 +134,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = @@ -142,7 +141,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -166,7 +164,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -181,8 +178,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); bool failed_check = false; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp index b9773fde351..d6923f750d4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp @@ -31,32 +31,27 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); // TAO-Specific way to get to the ORB Core (and thus, the ORB). TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) @@ -68,7 +63,6 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; @@ -83,16 +77,13 @@ Echo_Collocated_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, client_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) @@ -104,7 +95,6 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; @@ -119,16 +109,13 @@ Echo_Collocated_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, server_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } else diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index a9db6a71b8a..32cca3aa9dc 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) PortableServer::ObjectId_var id = root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,13 +81,11 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index 2082c0d81c9..20d48b0fba4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -28,14 +28,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -58,8 +58,7 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -78,8 +77,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -121,8 +118,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -138,8 +134,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -150,8 +145,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -159,8 +153,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -180,8 +173,7 @@ Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -190,8 +182,7 @@ Echo_Client_Request_Interceptor::receive_exception ( } CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -213,14 +204,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -242,8 +233,7 @@ Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -252,8 +242,7 @@ Echo_Server_Request_Interceptor::receive_request ( } PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -262,8 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -277,8 +265,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -292,8 +279,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -308,8 +294,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -323,8 +308,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -332,8 +316,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -353,8 +336,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -369,13 +351,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h index c136eb18144..652a0f4ba9d 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -32,11 +32,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( @@ -85,11 +85,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp index 31585a94528..c145b2fe700 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp @@ -30,7 +30,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -38,7 +38,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -46,11 +46,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index 0990fd47209..a1a7b9fbb27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp index 15751d6f087..4f1ff3e4708 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp @@ -32,25 +32,21 @@ Echo_Client_ORBInitializer::post_init ( TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -60,7 +56,6 @@ Echo_Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; @@ -75,16 +70,13 @@ Echo_Client_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, client_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp index 9136e25e126..bb17b9dcbc4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp @@ -29,32 +29,27 @@ Echo_Server_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); // TAO-Specific way to get to the ORB Core (and thus, the ORB). TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ServerRequestInterceptor_ptr interceptor = @@ -64,7 +59,6 @@ Echo_Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; @@ -79,16 +73,13 @@ Echo_Server_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index 7fbab820892..f33f57fbb52 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) PortableServer::ObjectId_var id = root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,16 +81,13 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 399025fa883..2fe59bcd88a 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -57,8 +57,7 @@ Echo_Client_Request_Interceptor::send_request ( client_interceptor_check_++; CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request\n")); @@ -71,8 +70,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -94,8 +92,7 @@ Echo_Client_Request_Interceptor::receive_other ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " @@ -111,8 +108,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " @@ -122,8 +118,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -134,8 +129,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -143,8 +137,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -165,12 +158,10 @@ Echo_Client_Request_Interceptor::receive_exception ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h index fc49396097a..fed9edd4a14 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp index 78a62bdf25e..52b80caf5d9 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp @@ -90,7 +90,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = @@ -98,7 +97,6 @@ main (int argc, char *argv[]) atc.get_TCHAR_argv (), "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, orb.in (), diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 9889379c63d..99dfbe20c3c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -25,14 +25,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -55,12 +55,10 @@ Echo_Server_Request_Interceptor::receive_request ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -69,8 +67,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -84,8 +81,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -100,8 +96,7 @@ Echo_Server_Request_Interceptor::send_reply ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -110,8 +105,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -125,8 +119,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -134,8 +127,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; @@ -154,8 +146,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -164,8 +155,7 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); if (0 == type.in()) @@ -178,8 +168,7 @@ Echo_Server_Request_Interceptor::send_exception ( ++server_interceptor_check_; - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h index 1c6f50936a3..ebdc7d817d8 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp index 720d51ab9ad..43308b6cdfe 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp @@ -90,7 +90,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = @@ -98,7 +97,6 @@ main (int argc, char *argv[]) atc.get_TCHAR_argv (), "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp index bf5fe31c9f8..066a8eee6b3 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp @@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,11 +45,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp index 881b1f2987f..0fb8a894577 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp @@ -29,7 +29,6 @@ Client_ORBInitializer::pre_init ( { PortableInterceptor::register_orb_initializer (second_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Registered the initializer, clear the pointer so that we only do it // once diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp index 9f716e09ada..6cad0525051 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp @@ -31,15 +31,12 @@ main (int argc, char *argv[]) { PortableInterceptor::register_orb_initializer (initializer_var1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb2 = CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index 9633a8d5413..77b56d9aae6 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -27,11 +27,9 @@ Client_ORBInitializer::post_init ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = info->orb_id (); - CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::StringSeq_var args = info->arguments (); CORBA::String_var forward_str; @@ -54,14 +52,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index 822a351436d..fa98f896530 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -37,11 +37,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index 9ab80aa7110..93c9c18b938 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -19,14 +19,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 4dc535962a1..3d1a75e1528 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -42,10 +42,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp index 8da1c03c45b..4bb1941106e 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp @@ -63,25 +63,21 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RedirectionTest::test_var server = RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -98,8 +94,7 @@ main (int argc, char *argv[]) "CLIENT: Issuing request %d.\n", i)); - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + number = server->number (); ACE_DEBUG ((LM_INFO, "CLIENT: Request %d handled by object %d.\n", @@ -107,8 +102,7 @@ main (int argc, char *argv[]) number)); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index 6ea299edcb3..2eb62181a6e 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -62,16 +62,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -80,11 +77,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (::parse_args (argc, argv) != 0) return -1; @@ -94,12 +89,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (test_impl); RedirectionTest::test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen (ior_file, "w"); if (output_file == 0) @@ -111,18 +104,14 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index 631d5a349e1..ab24a5f150b 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -18,14 +18,14 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h index 643fb36e3c7..6a733639a65 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h @@ -26,11 +26,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index 87e209cd234..a39c6f98ec4 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -26,13 +26,11 @@ Server_ORBInitializer::pre_init ( ACE_NEW (test, test_i); - CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_ptr object = test->_this (); orbinitinfo->register_initial_reference ("MyService", object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; bool invalid_name = false; ACE_TRY @@ -41,7 +39,6 @@ Server_ORBInitializer::pre_init ( orbinitinfo->register_initial_reference ("", object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex) { diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp index efac5ba2c36..66a8db517fb 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp @@ -17,13 +17,11 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ACE_NEW_RETURN (test, test_i, 1); - CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + CORBA::Object_ptr object = test->_this (); orb->register_initial_reference ("ORBMyService", object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (1); bool invalid_name = false; ACE_TRY @@ -32,7 +30,6 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) orb->register_initial_reference ("", object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::ORB::InvalidName, ex) { @@ -123,18 +120,14 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::register_orb_initializer (initializer_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var second_orb = CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp index ceb1ab95ee1..5d2c4b0bfe0 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -36,14 +36,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT B"), @@ -52,13 +50,11 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT C"), @@ -67,11 +63,9 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index dba6578f6f2..337a9c2810e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -25,7 +25,6 @@ Client_Request_Interceptor::send_request ( { CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -38,8 +37,7 @@ Client_Request_Interceptor::send_request ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -84,7 +82,6 @@ Client_Request_Interceptor::send_poll ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -105,7 +102,6 @@ Client_Request_Interceptor::receive_reply ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -120,8 +116,7 @@ Client_Request_Interceptor::receive_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -165,7 +160,6 @@ Client_Request_Interceptor::receive_exception ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -180,8 +174,7 @@ Client_Request_Interceptor::receive_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -195,13 +188,11 @@ Client_Request_Interceptor::receive_exception ( switch (scenario) { case 4: - exception = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + exception = ri->received_exception (); tc = exception->type (); - id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + id = tc->id (); if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { @@ -249,7 +240,6 @@ Client_Request_Interceptor::receive_other ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -266,8 +256,7 @@ Client_Request_Interceptor::client_side_test ( PortableInterceptor::ClientRequestInfo_ptr info ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::String_var op = info->operation (); return ACE_OS::strcmp (op.in (), "client_test") == 0 ? 1 : 0; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index c918a767b2c..f6417e34397 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -22,7 +22,7 @@ Request_Interceptor::name ( } void -Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL) +Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index ade0ae89891..6f41abec934 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -58,10 +58,10 @@ public: */ //@{ /// Return the name of this Requestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp index eaf11509671..c7146736418 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -34,14 +34,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER B"), @@ -50,13 +48,11 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER C"), @@ -65,11 +61,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 45e9c1b1650..3a80bebc486 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -29,7 +29,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -76,7 +75,6 @@ Server_Request_Interceptor::receive_request ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -95,7 +93,6 @@ Server_Request_Interceptor::send_reply ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -110,8 +107,7 @@ Server_Request_Interceptor::send_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -155,7 +151,6 @@ Server_Request_Interceptor::send_exception ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -170,8 +165,7 @@ Server_Request_Interceptor::send_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -185,13 +179,11 @@ Server_Request_Interceptor::send_exception ( switch (scenario) { case 4: - exception = ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + exception = ri->sending_exception (); tc = exception->type (); - id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + id = tc->id (); if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { @@ -239,7 +231,6 @@ Server_Request_Interceptor::send_other ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -256,8 +247,7 @@ Server_Request_Interceptor::server_side_test ( PortableInterceptor::ServerRequestInfo_ptr info ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::String_var op = info->operation (); return ACE_OS::strcmp (op.in (), "server_test") == 0 ? 1 : 0; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 52caf89e452..b607ad6df22 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -59,7 +59,6 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_TRY { server->client_test (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (i == 1) { @@ -93,7 +92,6 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -115,7 +113,6 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) { CORBA::ULongSeq_var ulongseq; server->server_test (i, ulongseq.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (i == 1) { @@ -149,7 +146,6 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -170,24 +166,20 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -198,16 +190,12 @@ main (int argc, char *argv[]) } ::client_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::server_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 6e4fa0d21d3..dcad7d0eb54 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -58,15 +58,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,30 +72,25 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (::parse_args (argc, argv) != 0) return -1; test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var obj = servant._this (); CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", ior.in ())); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Write IOR to a file. FILE *output_file= ACE_OS::fopen (ior_file, "w"); @@ -112,14 +104,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 17dee50ac55..e9cd269b863 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -59,7 +59,7 @@ test_i::server_test (Test::TestScenario scenario, } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h index 604d4ffb432..844bd60bc94 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -48,7 +48,7 @@ public: CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index fd053e810f0..4ce9d465ca0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -28,8 +28,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -38,13 +37,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp index 0ad8960c819..97f30fa7092 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -33,13 +33,11 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 80c6cfad678..ed6361d5ece 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -42,30 +42,26 @@ run_test (Test_Interceptors::Visual_ptr server { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -73,7 +69,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -91,22 +86,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -117,10 +108,8 @@ main (int argc, char *argv[]) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index e9ef8474a32..d054310e84c 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -26,14 +26,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -61,18 +61,14 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -99,12 +95,10 @@ Echo_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -133,18 +127,14 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -159,7 +149,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -179,7 +168,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -220,18 +208,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -246,7 +230,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -267,7 +250,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h index 10fcbd62f70..2214ee1e99a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index bb361528705..f6fce516ba9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -53,16 +53,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,14 +68,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -88,21 +82,17 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -121,13 +111,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index d253b1ab045..601e2028709 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -44,8 +44,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -56,7 +55,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -88,7 +86,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -109,8 +106,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_reply from \"%s\"\n", @@ -120,7 +116,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -141,7 +136,6 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -164,8 +158,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -177,7 +170,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -198,7 +190,6 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h index 9549d70f549..6fc60276759 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp index 503c7a5b423..a7839f0a2cd 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,8 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h index 5a6df58c457..fbe117ea5d2 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -32,17 +32,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 0139cdf6672..e7bce8edc2d 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -20,16 +20,13 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client client (orb.in (), app); client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creates the Qt widgets - client.create_widgets (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.create_widgets (); // This may look a bit suspect, but Qt wants the manager widget // as the toplevel widget unlike Xt for display purposes. @@ -89,11 +86,9 @@ Client::parse_args (int argc, CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->server_ = LCD_Display::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(this->server_.in ())) { diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index e4b50c40a70..9d155fda05d 100644 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -35,7 +35,7 @@ public: ~Client (void); //Dtor.. - void create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void create_widgets (void); // Adds the callbacks to the GUI underneath..... void show (void); diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 68ed428b4b6..ecf985bcae0 100644 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -62,11 +62,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,19 +73,16 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Create the Qt stuff.. // Instantiate the LCD_Display implementation class LCD_Display_imp display_impl (orb.in ()); LCD_Display_var server = - display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + display_impl._this (); // Create the LCD after the QVbox is created. QVBox box; @@ -110,7 +105,6 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -127,8 +121,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // We choose to run the main Qt event loop.. app.exec (); diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 0d961989108..7de1f9a7d44 100644 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -13,7 +13,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb) } void -LCD_Display_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +LCD_Display_imp::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index ac04d36afc9..857dca4b5c6 100644 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -36,7 +36,7 @@ public: // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); void send_val (CORBA::Long val diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index 8dd1103b673..89a29ffbc1f 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -29,39 +29,29 @@ int main(int, char**) int argc = 0; CORBA::ORB_var orb1 = CORBA::ORB_init(argc, 0, "orb1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb2 = CORBA::ORB_init(argc, 0, "orb2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poaObj_var = orb1->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var rootPoa = PortableServer::POA::_narrow (poaObj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poaManager = - rootPoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + rootPoa->the_POAManager (); CORBA::Object_var poaObj_var2 = orb2->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var rootPoa2 = PortableServer::POA::_narrow (poaObj_var2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poaManager2 = - rootPoa2->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + rootPoa2->the_POAManager (); - poaManager2->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - poaManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poaManager2->activate (); + poaManager->activate (); TestMonitorable_i* monitorable_i = 0; ACE_NEW_RETURN (monitorable_i, TestMonitorable_i, 1); @@ -74,28 +64,22 @@ int main(int, char**) PortableServer::ObjectId_var monitorableId1_var = rootPoa->activate_object (monitorable_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj1 = rootPoa->id_to_reference (monitorableId1_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Arch_Idl::Monitorable_var monitorable1 = Arch_Idl::Monitorable::_narrow (obj1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var monitorableId2_var = rootPoa2->activate_object (m2_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = rootPoa2->id_to_reference (monitorableId2_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Arch_Idl::Monitorable_var monitorable2 = Arch_Idl::Monitorable::_narrow (obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 248fb4b0f2e..7e724bdff8f 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -49,17 +49,14 @@ get_server_priority (Test_ptr server CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Narrow down to correct type. RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Make sure that we have the SERVER_DECLARED priority model. RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + priority_policy->priority_model (); if (priority_model != RTCORBA::SERVER_DECLARED) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: priority_model != " @@ -67,7 +64,7 @@ get_server_priority (Test_ptr server -1); // Return the server priority. - return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (); } void @@ -81,7 +78,6 @@ invocation_exception_test (Test_ptr obj, obj->test_method (1, priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // This next line of code should not run because an exception // should have been raised. @@ -100,7 +96,6 @@ invocation_exception_test (Test_ptr obj, ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } class Task : public ACE_Task_Base @@ -132,42 +127,34 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the RTCurrent. object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test object 1 (with CLIENT_PROPAGATED priority model). object = this->orb_->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var client_propagated_obj = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test object 2 (with SERVER_DECLARED priority model). object = this->orb_->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server_declared_obj = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test: Attempt to set priority bands that do not match server // resource configuration on the <client_propagated_obj>. @@ -187,7 +174,6 @@ Task::svc (void) policies[0] = rt_orb->create_priority_banded_connection_policy (false_bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Set false bands at the object level. Note that a new object // is returned. @@ -195,24 +181,20 @@ Task::svc (void) client_propagated_obj->_set_policy_overrides (policies, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client_propagated_obj = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoking on this object with false bands should produce an // exception. invocation_exception_test (client_propagated_obj.in (), 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the correct bands from the <server_declared_obj>. policies[0] = server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityBandedConnectionPolicy_var bands_policy = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policies[0]); @@ -226,12 +208,10 @@ Task::svc (void) client_propagated_obj->_set_policy_overrides (policies, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Overwrite existing <client_propagated_obj>. client_propagated_obj = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test: Attempt invocation on <client_propagated_obj> with // client thread priority not matching any of the bands. Should @@ -247,14 +227,12 @@ Task::svc (void) // Reset the current thread's priority. current->the_priority (client_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoking on this object with an invalid client thread // priority should produce an exception. invocation_exception_test (client_propagated_obj.in (), client_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test: Make invocations on the <client_propagated_obj>. ACE_DEBUG ((LM_DEBUG, @@ -272,13 +250,11 @@ Task::svc (void) // Reset the current thread's priority. current->the_priority (client_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke test method on server. client_propagated_obj->test_method (1, // CLIENT_PROPAGATED client_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Test: Attempt invocation with the same thread priority, but @@ -290,17 +266,14 @@ Task::svc (void) CORBA::Short server_priority = get_server_priority (server_declared_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke test method on server. server_declared_obj->test_method (0, // SERVER_DECLARED server_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Testing over. Shut down Server ORB. - server_declared_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_declared_obj->shutdown (); } ACE_CATCHANY { @@ -324,7 +297,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. int result = diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index b45fef9cba9..ece7dea038e 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -19,7 +19,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -39,12 +39,10 @@ Test_i::Test_i (CORBA::ORB_ptr orb, CORBA::Object_var obj = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->rt_current_ = RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -55,8 +53,7 @@ Test_i::test_method (CORBA::Boolean client_propagated, { // Get the upcall thread's priority. CORBA::Short server_priority = - this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->rt_current_->the_priority (); // Check which policy we are dealing with. if (!client_propagated) @@ -116,12 +113,11 @@ Test_i::test_method (CORBA::Boolean client_propagated, } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } //************************************************************************* @@ -239,19 +235,16 @@ create_object (PortableServer::POA_ptr poa, PortableServer::ObjectId_var id; id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create object reference. CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print ior to the file. if (filename != 0) @@ -285,7 +278,6 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa, poa->activate_object_with_priority (server_impl, priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // This next line of code should not run because an exception // should have been raised. @@ -304,7 +296,6 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa, ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } void @@ -321,7 +312,6 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa, manager, policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // This next line of code should not run because an exception // should have been raised. @@ -340,7 +330,6 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa, ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } int @@ -356,7 +345,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. int result = @@ -374,27 +362,22 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the RootPOA. object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA Manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Obtain priority bands to be used in this test from the file // specified by the user. @@ -440,7 +423,6 @@ main (int argc, char *argv[]) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test: Attempt to create a POA with priority bands that do not // match the lanes. Should get POA::InvalidPolicy exception. @@ -459,13 +441,11 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_banded_connection_policy (false_bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[1] = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Try to create a POA with invalid policies. Should throw an // exception. @@ -473,7 +453,6 @@ main (int argc, char *argv[]) poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Two policies for the next POA. poa_policy_list.length (2); @@ -483,13 +462,11 @@ main (int argc, char *argv[]) rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[1] = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED priority model, with lanes // but no bands. @@ -498,7 +475,6 @@ main (int argc, char *argv[]) poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Three policies for the next POA. poa_policy_list.length (3); @@ -512,19 +488,16 @@ main (int argc, char *argv[]) rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, poa_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a bands policy. poa_policy_list[1] = rt_orb->create_priority_banded_connection_policy (bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[2] = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA with SERVER_DECLARED priority model, with bands // and lanes. @@ -533,7 +506,6 @@ main (int argc, char *argv[]) poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test: Attempt to register an object with priority that // doesn't match lanes. Should get BAD_PARAM exception. @@ -542,7 +514,6 @@ main (int argc, char *argv[]) RTPortableServer::POA_var rt_server_declared_poa = RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Activation with incorrect priority should fail. CORBA::Short wrong_priority = 10000; @@ -550,19 +521,16 @@ main (int argc, char *argv[]) 0, wrong_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create first servant and register with <client_propagated_poa>. Test_i server_impl (orb.in (), bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = create_object (client_propagated_poa.in (), orb.in (), &server_impl, ior_output_file1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -570,27 +538,22 @@ main (int argc, char *argv[]) Test_i server_impl2 (orb.in (), bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = create_object (server_declared_poa.in (), orb.in (), &server_impl2, ior_output_file2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Run ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // Destroy ORB. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCH (CORBA::INTERNAL, exception) { diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index d57bc36ba7f..d2efbb0bec5 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -28,8 +28,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -38,13 +37,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index dc1fe8657cd..8716992f0a0 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -64,11 +64,9 @@ Task::svc (void) { CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -83,11 +81,9 @@ Task::svc (void) CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (priority_policy.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -95,8 +91,7 @@ Task::svc (void) -1); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->priority_model (); if (priority_model != RTCORBA::CLIENT_PROPAGATED) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,18 +103,14 @@ Task::svc (void) // for each. object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("PriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityMapping *pm = mapping_manager->mapping (); @@ -146,11 +137,9 @@ Task::svc (void) for (int i = 0; i < 3; ++i) { current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Short priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); if (desired_priority != priority) ACE_ERROR_RETURN ((LM_ERROR, @@ -160,14 +149,12 @@ Task::svc (void) server->test_method (priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; desired_priority++; } // Shut down Server ORB. - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCH (CORBA::DATA_CONVERSION, ex) { @@ -204,12 +191,10 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index bd250e433e7..a53b6cd45ef 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -20,14 +20,14 @@ Client_Request_Interceptor::~Client_Request_Interceptor (void) } char * -Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -64,7 +64,6 @@ Client_Request_Interceptor::receive_reply ( // report the fact via an exception. IOP::ServiceContext_var sc = ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -102,18 +101,14 @@ Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -121,11 +116,9 @@ Client_Request_Interceptor::receive_exception ( this->myname_, operation.in (), ior.in ())); - ACE_CHECK; // Try to get the RTCorbaPriority context. If its not there, // report the fact via an exception. IOP::ServiceContext_var sc = ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 414fa636345..9f4118b2dd7 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -32,11 +32,11 @@ public: virtual ~Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 463429c1312..4faab819821 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -22,7 +22,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -45,18 +45,15 @@ Test_i::test_method (CORBA::Short priority CORBA::Object_var obj = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (obj.in ())) ACE_THROW (CORBA::INTERNAL ()); CORBA::Short servant_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->the_priority (); // Print out the info. if (servant_thread_priority != priority) @@ -71,7 +68,7 @@ Test_i::test_method (CORBA::Short priority } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -135,11 +132,9 @@ Task::svc (void) { CORBA::Object_var object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -147,21 +142,16 @@ Task::svc (void) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED PriorityModelPolicy, // and register Test object with it. @@ -171,30 +161,25 @@ Task::svc (void) rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i server_impl (this->orb_.in ()); PortableServer::ObjectId_var id = child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var server = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -212,22 +197,18 @@ Task::svc (void) // Get the initial priority of the current thread. CORBA::Short initial_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); // Run ORB Event loop. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); // Get the final priority of the current thread. CORBA::Short final_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); if (final_thread_priority != initial_thread_priority) ACE_DEBUG ((LM_DEBUG, @@ -262,7 +243,6 @@ main (int argc, char *argv[]) // RootPOA, RTORB, RTCurrent, POAManager). CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 2ef31055c8f..3fd1935a8d9 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -69,8 +69,7 @@ exception_test (Test_ptr server, { ACE_TRY { - server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method (); } ACE_CATCH (CORBA::INV_POLICY, ex) { @@ -83,7 +82,6 @@ exception_test (Test_ptr server, ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } int @@ -96,7 +94,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -105,20 +102,16 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyManager. object = orb->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (policy_manager.in (), "PolicyManager") == -1) return -1; @@ -126,27 +119,21 @@ main (int argc, char *argv[]) // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return -1; // Test object 1 (ClientProtocolPolicy set on server). object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2 (no client-exposed ClientProtocolPolicy). object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -156,8 +143,7 @@ main (int argc, char *argv[]) // ClientProtocolPolicy set on the server side. ACE_DEBUG ((LM_DEBUG, "\n Test 1\n")); - server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->test_method (); // Test 2: Set the ORB-level ClientProtocolPolicy override, and // attempt the same invocation again. Should get @@ -178,16 +164,13 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; exception_test (server1.in (), "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test 3: Attempt the invocation on the second object reference // (the one that didn't have ClientProtocolPolicy set on the @@ -195,8 +178,7 @@ main (int argc, char *argv[]) // conflicts. ACE_DEBUG ((LM_DEBUG, "\n Test 3\n")); - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); // Test 4: Override ClientProtocolPolicy on the Current level. // For the override value, use the sequence of protocols, none @@ -214,16 +196,13 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; exception_test (server2.in (), "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test 5: Override ClientProtocolPolicy on the Current level // again. This time use the sequence in which the first @@ -237,21 +216,17 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); // Testing over. Shut down server ORB. ACE_DEBUG ((LM_DEBUG, "\n Testing over\n")); - server2->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->shutdown (); // Needed for SHMIOP to work fine. Please dont remove. Please // see Bug 1197 for details. diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 6b4cc59125f..66a6c7f0538 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -16,10 +16,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -41,7 +41,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -120,17 +120,14 @@ create_object (PortableServer::POA_ptr poa, // Register with poa. PortableServer::ObjectId_var id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -158,7 +155,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -167,27 +163,22 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Create child POA with RTCORBA::ClientProtocolPolicy set. RTCORBA::ProtocolList protocols; @@ -205,14 +196,12 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Servant. Test_i server_impl (orb.in ()); @@ -222,7 +211,6 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\nActivated object one as ")); result = create_object (poa.in (), orb.in (), &server_impl, ior_output_file1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; @@ -230,16 +218,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\nActivated object two as ")); result = create_object (root_poa.in (), orb.in (), &server_impl, ior_output_file2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; // Run ORB Event loop. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index fa40bd0ca34..73d2e5eb3c6 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -37,13 +37,13 @@ public: Tests &tests ACE_ENV_ARG_DECL); - void start (ACE_ENV_SINGLE_ARG_DECL) + void start (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); int client_propagated (void); @@ -113,12 +113,10 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->current_ = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -214,7 +212,7 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority) } void -test_i::start (ACE_ENV_SINGLE_ARG_DECL) +test_i::start (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -235,28 +233,22 @@ test_i::start (ACE_ENV_SINGLE_ARG_DECL) this->current_.in (), this->orb_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - test->object_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test->object_->method (); CORBA::String_var ior = this->orb_->object_to_string (test->object_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = this->orb_->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_var test_from_string = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - test_from_string->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test_from_string->method (); iterator.advance (); } @@ -304,14 +296,14 @@ test_i::thread_info (const char *method_name) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->thread_info ("test_i::method"); } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -323,8 +315,7 @@ setup_test_parameters (Test_Object_And_Servant *test, ACE_ENV_ARG_DECL) { CORBA::Short current_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->the_priority (); if (!test->servant_->serviced_by_rt_tp () || test->servant_->client_propagated ()) @@ -377,7 +368,7 @@ public: Server (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL); - void create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL); + void create_servant_in_root_poa (void); void create_poa_and_servant_with_tp_policy (const char *poa_name, int set_priority_model, RTCORBA::PriorityModel priority_model @@ -385,9 +376,9 @@ public: void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, RTCORBA::PriorityModel priority_model ACE_ENV_ARG_DECL); - void test (ACE_ENV_SINGLE_ARG_DECL); - void start_testing (ACE_ENV_SINGLE_ARG_DECL); - void shutdown (ACE_ENV_SINGLE_ARG_DECL); + void test (void); + void start_testing (void); + void shutdown (void); CORBA::ORB_var orb_; RTCORBA::RTORB_var rt_orb_; @@ -420,47 +411,38 @@ Server::Server (CORBA::ORB_ptr orb CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->current_ = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; default_thread_priority = - this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->current_->the_priority (); object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->poa_manager_ = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->root_poa_->the_POAManager (); - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->poa_manager_->activate (); } void -Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL) +Server::create_servant_in_root_poa (void) { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -469,7 +451,6 @@ Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL) this->tests_ ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; servant->invocation_pool_and_lane (0, 0); servant->in_lane (0); @@ -481,8 +462,7 @@ Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL) this->tests_[this->tests_.size () - 1].servant_ = servant; this->tests_[this->tests_.size () - 1].object_ = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); } void @@ -500,18 +480,15 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, this->max_buffered_requests_, this->max_request_buffer_size_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; @@ -531,12 +508,10 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, this->poa_manager_.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant1 = 0; ACE_NEW_THROW_EX (servant1, @@ -545,7 +520,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, this->tests_ ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; servant1->in_lane (0); @@ -561,7 +535,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, id1 = rt_poa->activate_object (servant1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -573,7 +546,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, this->tests_ ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; servant2->in_lane (0); @@ -592,18 +564,15 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, rt_poa->activate_object_with_priority (servant1, default_thread_priority + 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; id2 = rt_poa->activate_object_with_priority (servant2, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object2 = poa->id_to_reference (id2.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = @@ -611,7 +580,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant2; - ACE_CHECK; } } else @@ -621,7 +589,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, id1 = rt_poa->activate_object (servant1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::ServantBase_var safe_servant (servant1); @@ -629,7 +596,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, CORBA::Object_var object1 = poa->id_to_reference (id1.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = @@ -637,7 +603,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant1; - ACE_CHECK; } void @@ -664,18 +629,15 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->max_buffered_requests_, this->max_request_buffer_size_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; @@ -692,12 +654,10 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->poa_manager_.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant1 = 0; ACE_NEW_THROW_EX (servant1, @@ -706,7 +666,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->tests_ ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; servant1->in_lane (1); @@ -722,7 +681,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, id1 = rt_poa->activate_object (servant1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -734,7 +692,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->tests_ ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); - ACE_CHECK; servant2->in_lane (1); @@ -753,18 +710,15 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, rt_poa->activate_object_with_priority (servant1, default_thread_priority + 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; id2 = rt_poa->activate_object_with_priority (servant2, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object2 = poa->id_to_reference (id2.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = @@ -772,13 +726,11 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant2; - ACE_CHECK; } CORBA::Object_var object1 = poa->id_to_reference (id1.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = @@ -786,11 +738,10 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant1; - ACE_CHECK; } void -Server::start_testing (ACE_ENV_SINGLE_ARG_DECL) +Server::start_testing (void) { Tests::ITERATOR iterator (this->tests_); while (!iterator.done ()) @@ -802,40 +753,33 @@ Server::start_testing (ACE_ENV_SINGLE_ARG_DECL) this->current_.in (), this->orb_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - test->object_->start (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test->object_->start (); iterator.advance (); } } void -Server::test (ACE_ENV_SINGLE_ARG_DECL) +Server::test (void) { - this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->start_testing (); ACE_DEBUG ((LM_DEBUG, "\n\n*** Changing priority to be higher ***\n\n")); this->current_->the_priority (default_thread_priority + 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->start_testing (); } void -Server::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Server::shutdown (void) { this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->destroy (); } class Task : public ACE_Task_Base @@ -865,44 +809,35 @@ Task::svc (void) { Server server (this->orb_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server.create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.create_servant_in_root_poa (); server.create_poa_and_servant_with_tp_policy ("tp_client_propagated_poa", 1, RTCORBA::CLIENT_PROPAGATED ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_policy ("tp_server_declared_poa", 1, RTCORBA::SERVER_DECLARED ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_policy ("tp_no_priority_model_poa", 0, RTCORBA::CLIENT_PROPAGATED ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa", RTCORBA::CLIENT_PROPAGATED ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa", RTCORBA::SERVER_DECLARED ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server.test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test (); - server.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.shutdown (); } ACE_CATCHANY { @@ -925,7 +860,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Make sure we can support multiple priorities that are // required for this test. diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp index ed68835f061..88f7b6bb573 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -55,7 +55,6 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return id; } @@ -83,7 +82,6 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return id; } @@ -98,31 +96,25 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); int result = parse_args (argc, argv); @@ -137,24 +129,19 @@ main (int argc, char *argv[]) RTCORBA::ThreadpoolId id = create_threadpool (rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; rt_orb->destroy_threadpool (id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; id = create_threadpool_with_lanes (rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; rt_orb->destroy_threadpool (id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 1956eb1e5ac..9c6d8d9cc3f 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -30,12 +30,10 @@ change_network_priority (int enable_network_priority, { CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Set the tcp protocol protperties RTCORBA::TCPProtocolProperties_var tcp_properties = @@ -46,7 +44,6 @@ change_network_priority (int enable_network_priority, 1, enable_network_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList protocols; protocols.length (1); @@ -61,7 +58,6 @@ change_network_priority (int enable_network_priority, policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; switch (level) { @@ -70,16 +66,13 @@ change_network_priority (int enable_network_priority, { object = orb->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; break; } @@ -90,16 +83,13 @@ change_network_priority (int enable_network_priority, object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; break; } @@ -110,10 +100,8 @@ change_network_priority (int enable_network_priority, CORBA::Object_var object = server->_set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; break; } @@ -189,7 +177,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; @@ -197,22 +184,18 @@ main (int argc, char *argv[]) // Initialize and obtain reference to the Test object. CORBA::Object_var client_object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (client_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Resolve the Network priority Mapping Manager CORBA::Object_var object = orb->resolve_initial_references ("NetworkPriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::NetworkPriorityMappingManager_var mapping_manager = RTCORBA::NetworkPriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize the custom priority mapping Custom_Network_Priority_Mapping *cnpm = 0; @@ -250,15 +233,13 @@ main (int argc, char *argv[]) break; } - server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method (); } // Shut down Server ORB. if (shutdown_server) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index cee01e1b4f7..98035dc47ef 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -15,10 +15,10 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - void test_method (ACE_ENV_SINGLE_ARG_DECL) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -39,7 +39,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -86,16 +86,13 @@ create_object (PortableServer::POA_ptr poa, PortableServer::ObjectId_var id = poa->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; FILE *output_file= ACE_OS::fopen (filename, "w"); ACE_OS::fprintf (output_file, "%s", ior.in ()); @@ -113,7 +110,6 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -123,16 +119,13 @@ main (int argc, char *argv[]) object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Servant. Test_i servant (orb.in ()); @@ -143,17 +136,14 @@ main (int argc, char *argv[]) &servant, simple_servant_ior_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("NetworkPriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::NetworkPriorityMappingManager_var mapping_manager = RTCORBA::NetworkPriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Custom_Network_Priority_Mapping *cnpm = 0; ACE_NEW_RETURN (cnpm, @@ -168,12 +158,10 @@ main (int argc, char *argv[]) object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Set transport protocol properties RTCORBA::TCPProtocolProperties_var tcp_properties = @@ -184,7 +172,6 @@ main (int argc, char *argv[]) 1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList protocols; protocols.length (1); @@ -200,7 +187,6 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_server_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA with Diffserv enabled PortableServer::POA_var poa_with_diffserv = @@ -208,7 +194,6 @@ main (int argc, char *argv[]) poa_manager.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create object 2. create_object (poa_with_diffserv.in (), @@ -216,15 +201,12 @@ main (int argc, char *argv[]) &servant, diffserv_servant_ior_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Start ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index abe1dd456ec..0f26de829f3 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -79,11 +79,9 @@ Task::svc (void) { CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; pid_t pid = ACE_OS::getpid (); @@ -98,7 +96,6 @@ Task::svc (void) i, mtc ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Each 2 iterations sleep 5 seconds if (i % 2 == 0) @@ -143,8 +140,7 @@ Task::svc (void) if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY @@ -165,7 +161,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index ea5dc6db558..f1e665bb85d 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -65,7 +65,6 @@ write_ior_to_file (CORBA::ORB_ptr orb, CORBA::String_var ior = orb->object_to_string (test ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -109,7 +108,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Thread pool policy. policies[1] = @@ -120,7 +118,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the POA under the RootPOA. PortableServer::POA_var poa = @@ -128,15 +125,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[i]->destroy (); } test_i *servant = @@ -148,14 +143,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, ACE_UNUSED_ARG (safe_servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + servant->_this (); int result = write_ior_to_file (orb, test.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return result; } @@ -188,59 +181,48 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Priority default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); test_i servant (this->orb_.in (), root_poa.in (), nap_time); test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); int result = write_ior_to_file (this->orb_.in (), test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::ULong stacksize = 0; CORBA::Boolean allow_request_buffering = 0; @@ -256,12 +238,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_1 = rt_orb->create_threadpool_policy (threadpool_id_1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (1); @@ -279,12 +259,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_2 = rt_orb->create_threadpool_policy (threadpool_id_2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -294,7 +272,6 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -306,15 +283,12 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -337,7 +311,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index 6fbd244dd26..70925240498 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -56,16 +56,15 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h index 7951ca0854c..c97381b3e02 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h @@ -27,11 +27,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Our POA. - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: /// ORB. diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 25e0135f39b..7ad8531b54b 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -55,7 +55,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -64,29 +63,23 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return -1; // Test object. object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server.in (), "server") == -1) return -1; @@ -109,12 +102,10 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Test 1\n")); @@ -122,7 +113,6 @@ main (int argc, char *argv[]) CORBA::PolicyList_var pols; int status = server->_validate_connection (pols.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!status) ACE_DEBUG ((LM_DEBUG, @@ -134,8 +124,7 @@ main (int argc, char *argv[]) // NO new connections should get established. ACE_DEBUG ((LM_DEBUG, "\n Test 2\n")); - server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->test_method (); // Test 3: Check that <validate_connection> detects policy // misconfigurations and reports them through @@ -151,16 +140,13 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; status = server->_validate_connection (pols.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status) ACE_DEBUG ((LM_DEBUG, @@ -187,18 +173,15 @@ main (int argc, char *argv[]) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Testing over - shutting down\n")); ACE_OS::sleep (2); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_OS::sleep (2); } diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 7c434d0c2e5..385adec4426 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -17,10 +17,10 @@ public: // ctor // = The Test methods. - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -42,7 +42,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -102,17 +102,14 @@ create_object (PortableServer::POA_ptr poa, PortableServer::ObjectId_var id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -140,7 +137,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -149,17 +145,14 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Servant. Test_i server_impl (orb.in ()); @@ -171,16 +164,13 @@ main (int argc, char *argv[]) &server_impl, ior_output_file ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; // Run ORB Event loop. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); } diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 6588b34f7a4..b065dd6271c 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -78,7 +78,7 @@ public: int svc (void); - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); + void validate_connection (void); private: test_var test_; @@ -98,7 +98,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager, } void -Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Worker_Thread::validate_connection (void) { // Try to validate the connection several times, ignoring transient // exceptions. If the connection can still not be setup, return @@ -113,7 +113,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ++current_attempt; this->test_->_validate_connection (inconsistent_policies.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If successful, we are done. return; @@ -131,7 +130,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -142,15 +140,12 @@ Worker_Thread::svc (void) { this->current_->the_priority (this->priority_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); for (int i = 0; i < iterations; i++) { - this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->method (); } } ACE_CATCHANY @@ -190,46 +185,37 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; current->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ULong_Array priorities; int result = @@ -250,14 +236,12 @@ Task::svc (void) policies, debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; u_long i = 0; @@ -305,8 +289,7 @@ Task::svc (void) if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY @@ -329,7 +312,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 9129c0f3ee9..98b4974ab6d 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -15,13 +15,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: @@ -37,7 +37,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -53,11 +53,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -125,7 +124,6 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; u_int result = 0; result = @@ -167,26 +165,21 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies; @@ -197,7 +190,6 @@ Task::svc (void) policies, debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -215,7 +207,6 @@ Task::svc (void) policies, debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -223,13 +214,11 @@ Task::svc (void) rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Implicit_activation policy. CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -244,35 +233,28 @@ Task::svc (void) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (this->orb_.in (), poa.in ()), CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); write_iors_to_file (test.in (), this->orb_.in (), ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -294,7 +276,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index de8d374edf7..27def4d9f77 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -169,11 +169,9 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("PriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1) return -1; @@ -183,19 +181,15 @@ Task::svc (void) // RTCurrent. object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (current.in (), "RTCurrent") == -1) return -1; // Obtain Test object reference. object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server.in (), "Test object") == -1) return -1; @@ -204,18 +198,15 @@ Task::svc (void) CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->priority_model (); if (priority_model != RTCORBA::CLIENT_PROPAGATED) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: priority_model != " @@ -275,9 +266,7 @@ Task::svc (void) // Testing over. Shut down the server. ACE_DEBUG ((LM_DEBUG, "Client threads finished\n")); current->the_priority (priority1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -300,7 +289,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -380,10 +368,8 @@ Worker_Thread::svc (void) // RTORB. CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 0; @@ -391,10 +377,8 @@ Worker_Thread::svc (void) object = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return 0; @@ -413,12 +397,10 @@ Worker_Thread::svc (void) policy_list[0] = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Wait for other threads. this->synchronizer_->wait (); @@ -426,8 +408,7 @@ Worker_Thread::svc (void) for (int i = 0; i < iterations; ++i) { // Invoke method. - this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->test_method (); } } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 893dbddf688..fde1982564a 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -18,10 +18,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -42,7 +42,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARA } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -119,27 +119,22 @@ Task::svc (void) // RTORB. CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Create POA with CLIENT_PROPAGATED PriorityModelPolicy. CORBA::PolicyList poa_policy_list; @@ -148,31 +143,26 @@ Task::svc (void) rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create object. Test_i server_impl (this->orb_.in ()); PortableServer::ObjectId_var id = child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var server = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -189,12 +179,10 @@ Task::svc (void) } // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Start ORB event loop. - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } @@ -217,7 +205,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp index 9277febd56e..a078e2cd10e 100644 --- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp +++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp @@ -33,19 +33,16 @@ test_multiple_orbs (const char *test_name, argv, name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (rt_orb) { CORBA::Object_var object = orbs[i]->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; rt_orbs[i] = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ()); } @@ -57,8 +54,7 @@ test_multiple_orbs (const char *test_name, i < iterations; ++i) { - orbs[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orbs[i]->destroy (); } } } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index 6e9b26cbec7..8a28b1ac007 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -59,7 +59,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -69,12 +68,10 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) { @@ -86,14 +83,12 @@ main (int argc, char **argv) for (int i = 0; i < iterations; i++) { - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); } if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index d75fb4a6afd..a3837fc739e 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -13,13 +13,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: @@ -35,7 +35,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -43,7 +43,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -51,11 +51,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -128,7 +127,6 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) ACE_DEBUG ((LM_DEBUG, @@ -159,12 +157,10 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var lifespan_policy = root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -179,26 +175,22 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (orb, poa.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), orb, persistent_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -217,17 +209,14 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; @@ -244,26 +233,22 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (orb, poa.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), orb, transient_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -282,22 +267,18 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var lifespan_policy = root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; @@ -318,26 +299,22 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (orb, poa.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), orb, tp_persistent_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -350,7 +327,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -360,69 +336,55 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); create_poa_and_servant_with_tp_policy (orb.in (), rt_orb.in (), root_poa.in (), poa_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; create_poa_and_servant_with_persistent_policy (orb.in (), root_poa.in (), poa_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; create_poa_with_tp_and_persistent_policy (orb.in (), rt_orb.in (), root_poa.in (), poa_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCH (CORBA::INTERNAL, ex) { diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index 63d97ab4717..0c38f923ca9 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -37,17 +37,14 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rtorb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* * The following code should be reenabled once the OMG spec has @@ -59,7 +56,6 @@ main (int argc, char **argv) rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, RTCORBA::minPriority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= RTCORBA::CLIENT_PROPAGATED; @@ -69,12 +65,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var policy2 = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->priority_model () == policy2->priority_model ()); ACE_ASSERT (policy1->server_priority () == policy2->server_priority ()); @@ -88,7 +82,6 @@ main (int argc, char **argv) RTCORBA::ThreadpoolPolicy_var policy1 = rtorb->create_threadpool_policy (poolid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= poolid; @@ -97,12 +90,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::THREADPOOL_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ThreadpoolPolicy_var policy2 = RTCORBA::ThreadpoolPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->threadpool () == policy2->threadpool ()); } @@ -113,7 +104,6 @@ main (int argc, char **argv) RTCORBA::ServerProtocolPolicy_var policy1 = rtorb->create_server_protocol_policy (empty_protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= empty_protocols; @@ -122,12 +112,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ServerProtocolPolicy_var policy2 = RTCORBA::ServerProtocolPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocols1 = policy1->protocols (); @@ -143,7 +131,6 @@ main (int argc, char **argv) RTCORBA::ClientProtocolPolicy_var policy1 = rtorb->create_client_protocol_policy (empty_protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= empty_protocols; @@ -152,12 +139,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ClientProtocolPolicy_var policy2 = RTCORBA::ClientProtocolPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocols1 = policy1->protocols (); @@ -169,8 +154,7 @@ main (int argc, char **argv) { RTCORBA::PrivateConnectionPolicy_var policy1 = - rtorb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + rtorb->create_private_connection_policy (); CORBA::Any policy_value; @@ -178,12 +162,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PrivateConnectionPolicy_var policy2 = RTCORBA::PrivateConnectionPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -192,7 +174,6 @@ main (int argc, char **argv) RTCORBA::PriorityBandedConnectionPolicy_var policy1 = rtorb->create_priority_banded_connection_policy (empty_priority_bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= empty_priority_bands; @@ -201,12 +182,10 @@ main (int argc, char **argv) orb->create_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityBandedConnectionPolicy_var policy2 = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityBands_var priority_bands1 = policy1->priority_bands (); @@ -227,7 +206,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 56f29a399f9..ca8a9719d14 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -81,52 +81,42 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (int i = 0; i < iterations; i++) { current->the_priority (default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Short priority = - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); if (priority != TAO_INVALID_PRIORITY) { current->the_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test->prioritized_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->prioritized_method (); } } if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY @@ -149,7 +139,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index db378d994bd..89166031267 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -16,16 +16,16 @@ public: CORBA::Short server_priority, CORBA::Short client_priority); - CORBA::Short method (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Short method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void prioritized_method (ACE_ENV_SINGLE_ARG_DECL) + void prioritized_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: @@ -47,7 +47,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } CORBA::Short -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -57,22 +57,19 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL) +test_i::prioritized_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Short priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->the_priority (); ACE_DEBUG ((LM_DEBUG, "test_i::prioritized_method: client = %d server = %d (should be %d)\n", @@ -84,7 +81,7 @@ test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -92,11 +89,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -156,7 +152,6 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; u_int result = 0; result = @@ -178,8 +173,8 @@ public: PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr poa_manager); - void test_root_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_child_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_root_poa (void); + void test_child_poa (void); typedef void (server::*test_function) (CORBA::PolicyList &policies, CORBA::Short server_priority, @@ -236,29 +231,29 @@ public: const char *test_name ACE_ENV_ARG_DECL); - void test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_default_pool_no_bands_client_propagated_poa (void); - void test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_no_lanes_no_bands_client_propagated_poa (void); - void test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_lanes_no_bands_client_propagated_poa (void); - void test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_default_pool_bands_client_propagated_poa (void); - void test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_no_lanes_bands_client_propagated_poa (void); - void test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_lanes_bands_client_propagated_poa (void); - void test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_default_pool_no_bands_server_declared_poa (void); - void test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_no_lanes_no_bands_server_declared_poa (void); - void test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_lanes_no_bands_server_declared_poa (void); - void test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_default_pool_bands_server_declared_poa (void); - void test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_no_lanes_bands_server_declared_poa (void); - void test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_lanes_bands_server_declared_poa (void); private: @@ -280,7 +275,7 @@ server::server (CORBA::ORB_ptr orb, } void -server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_root_poa (void) { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -289,37 +284,32 @@ server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL) TAO_INVALID_PRIORITY, TAO_INVALID_PRIORITY), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), this->orb_.in (), "root" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_child_poa (void) { CORBA::PolicyList policies; policies.length (1); policies[policies.length () - 1] = this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA ("child", this->poa_manager_.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -328,19 +318,16 @@ server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL) TAO_INVALID_PRIORITY, TAO_INVALID_PRIORITY), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), this->orb_.in (), "child" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -356,7 +343,6 @@ server::test_default_pool_poa (CORBA::Short server_priority, client_priority, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -381,14 +367,12 @@ server::test_bands_poa (CORBA::PolicyList &policies, policies[policies.length () - 1] = this->rt_orb_->create_priority_banded_connection_policy (bands ACE_ENV_ARG_PARAMETER); - ACE_CHECK; (this->*function) (policies, server_priority, client_priority, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -407,12 +391,10 @@ server::test_no_lanes_poa (CORBA::Short server_priority, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; policies.length (1); @@ -424,7 +406,6 @@ server::test_no_lanes_poa (CORBA::Short server_priority, client_priority, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -457,12 +438,10 @@ server::test_lanes_poa (CORBA::Short server_priority, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policies; policies.length (1); @@ -474,7 +453,6 @@ server::test_lanes_poa (CORBA::Short server_priority, client_priority, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -489,19 +467,16 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -510,25 +485,21 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, server_priority, client_priority), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); PortableServer::ObjectId_var id = rt_poa->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; write_iors_to_file (object.in (), this->orb_.in (), test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -544,73 +515,66 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies, &server::test_no_bands_client_propagated_poa, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_default_pool_no_bands_client_propagated_poa (void) { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, &server::test_no_bands_client_propagated_poa, "default_pool_no_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_no_bands_client_propagated_poa (void) { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, &server::test_no_bands_client_propagated_poa, "no_lanes_no_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_lanes_no_bands_client_propagated_poa (void) { this->test_lanes_poa (::client_priority, ::client_priority, &server::test_no_bands_client_propagated_poa, "lanes_no_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_default_pool_bands_client_propagated_poa (void) { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, &server::test_bands_client_propagated_poa, "default_pool_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_bands_client_propagated_poa (void) { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, &server::test_bands_client_propagated_poa, "no_lanes_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_lanes_bands_client_propagated_poa (void) { this->test_lanes_poa (::client_priority, ::client_priority + 1, &server::test_bands_client_propagated_poa, "lanes_bands_client_propagated" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -626,19 +590,16 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, default_thread_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -647,7 +608,6 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, server_priority, client_priority), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); @@ -655,18 +615,15 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, rt_poa->activate_object_with_priority (servant, ::server_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; write_iors_to_file (object.in (), this->orb_.in (), test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -682,73 +639,66 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies, &server::test_no_bands_server_declared_poa, test_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_default_pool_no_bands_server_declared_poa (void) { this->test_default_pool_poa (::server_priority, ::client_priority + 1, &server::test_no_bands_server_declared_poa, "default_pool_no_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_no_bands_server_declared_poa (void) { this->test_no_lanes_poa (::server_priority, ::client_priority - 1, &server::test_no_bands_server_declared_poa, "no_lanes_no_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_lanes_no_bands_server_declared_poa (void) { this->test_lanes_poa (::server_priority, ::client_priority + 1, &server::test_no_bands_server_declared_poa, "lanes_no_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_default_pool_bands_server_declared_poa (void) { this->test_default_pool_poa (::server_priority, ::client_priority - 1, &server::test_bands_server_declared_poa, "default_pool_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_bands_server_declared_poa (void) { this->test_no_lanes_poa (::server_priority, ::client_priority + 1, &server::test_bands_server_declared_poa, "no_lanes_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -server::test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) +server::test_lanes_bands_server_declared_poa (void) { this->test_lanes_poa (::server_priority, ::client_priority - 1, &server::test_bands_server_declared_poa, "lanes_bands_server_declared" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } class Task : public ACE_Task_Base @@ -779,12 +729,10 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The following sets the current thread to the lowest priority // for this scheduling policy. This will give us the biggest @@ -808,16 +756,13 @@ Task::svc (void) object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); client_priority = default_thread_priority + 2; @@ -828,72 +773,52 @@ Task::svc (void) object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); server server (this->orb_.in (), rt_orb.in (), root_poa.in (), poa_manager.in ()); - server.test_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_root_poa (); - server.test_child_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_child_poa (); - server.test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_default_pool_no_bands_client_propagated_poa (); - server.test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_default_pool_no_bands_server_declared_poa (); - server.test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_no_lanes_no_bands_client_propagated_poa (); - server.test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_no_lanes_no_bands_server_declared_poa (); - server.test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_lanes_no_bands_client_propagated_poa (); - server.test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_lanes_no_bands_server_declared_poa (); - server.test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_default_pool_bands_client_propagated_poa (); - server.test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_default_pool_bands_server_declared_poa (); - server.test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_no_lanes_bands_client_propagated_poa (); - server.test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_no_lanes_bands_server_declared_poa (); - server.test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_lanes_bands_client_propagated_poa (); - server.test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.test_lanes_bands_server_declared_poa (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -915,7 +840,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index d33a71f3f25..850a1857e9b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -86,35 +86,28 @@ Task::svc (void) { CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Priority default_thread_priority = - rt_current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + rt_current->the_priority (); RTCORBA::Priority low_priority = default_thread_priority; @@ -136,26 +129,21 @@ Task::svc (void) policies[0] = rt_orb->create_priority_banded_connection_policy (bands ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = test->_set_policy_overrides (policies, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } rt_current->the_priority (low_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test->initialize (iterations * 2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int i = 0; char iteration_description[BUFSIZ]; @@ -165,12 +153,10 @@ Task::svc (void) test->method (work, iteration_description ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } rt_current->the_priority (high_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (i = 0; i != iterations; ++i) { @@ -178,7 +164,6 @@ Task::svc (void) test->method (work, iteration_description ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -199,7 +184,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index b14c292ffe6..dcd2b4a17d5 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -64,7 +64,6 @@ write_ior_to_file (CORBA::ORB_ptr orb, CORBA::String_var ior = orb->object_to_string (test ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -109,7 +108,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Thread pool policy. policies[1] = @@ -120,7 +118,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the POA under the RootPOA. PortableServer::POA_var poa = @@ -128,15 +125,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[i]->destroy (); } test_i *servant = @@ -149,14 +144,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, ACE_UNUSED_ARG (safe_servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + servant->_this (); int const result = write_ior_to_file (orb, test.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return result; } @@ -189,46 +182,37 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Priority default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); low_priority = default_thread_priority; high_priority = default_thread_priority + 1; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::ULong stacksize = 0; CORBA::Boolean allow_request_buffering = 0; @@ -244,12 +228,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_1 = rt_orb->create_threadpool_policy (threadpool_id_1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (2); @@ -271,12 +253,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_2 = rt_orb->create_threadpool_policy (threadpool_id_2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -286,7 +266,6 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -298,15 +277,12 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -329,7 +305,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index e4ae87b051b..a83c6442b0e 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -29,7 +29,6 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->rt_current_ = RTCORBA::Current::_narrow (object.in () @@ -60,8 +59,7 @@ test_i::method (CORBA::ULong work, (TAO_Thread_Lane *) tss->lane_; RTCORBA::Priority current_priority = - this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->rt_current_->the_priority (); const char *priority_string = 0; if (current_priority == this->low_priority_) @@ -99,12 +97,11 @@ test_i::method (CORBA::ULong work, { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h index 634167f5f35..3d7bb55eb47 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h @@ -33,7 +33,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Our POA. - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); /// Work (burn CPU). void work (CORBA::ULong work); diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index a1b7369b55d..42e98aa72ad 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -58,7 +58,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -67,37 +66,29 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return -1; // Test object 1. object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2. object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -106,30 +97,25 @@ main (int argc, char *argv[]) // following three. ACE_DEBUG ((LM_DEBUG, "\n Invocation 1 --> new connection\n")); - server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 2 --> use connection from invocation 1\n")); - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 3 --> use connection from invocation 1\n")); - server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 4 --> use connection from invocation 1\n")); - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); // Set RTCORBA::PrivateConnectionPolicy on PolicyCurrent. CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + rt_orb->create_private_connection_policy (); policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE @@ -143,29 +129,24 @@ main (int argc, char *argv[]) // third, and <server2>'s reused on fourth. ACE_DEBUG ((LM_DEBUG, "\n Invocation 5 --> new connection\n")); - server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 6 --> new connection\n")); - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 7 --> use connection from invocation 5\n")); - server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->test_method (); ACE_DEBUG ((LM_DEBUG, "\n Invocation 8 --> use connection from invocation 6\n")); - server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server2->test_method (); // Testing over. Shut down Server ORB. ACE_DEBUG ((LM_DEBUG, "\n Testing over - shutting down\n")); - server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 07a844b3abb..2f802f07872 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -16,10 +16,10 @@ public: // ctor // = The Test methods. - void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -41,7 +41,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -107,17 +107,14 @@ create_object (PortableServer::POA_ptr poa, PortableServer::ObjectId_var id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -145,7 +142,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -154,17 +150,14 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Servants. Test_i server_impl1 (orb.in ()); @@ -177,7 +170,6 @@ main (int argc, char *argv[]) &server_impl1, ior_output_file1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; @@ -186,16 +178,13 @@ main (int argc, char *argv[]) &server_impl2, ior_output_file2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; // Run ORB Event loop. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 61acf71eab9..247d0ba484f 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -105,7 +105,7 @@ public: RTCORBA::RTORB_ptr rt_orb, CORBA::PolicyManager_ptr policy_manager); - void vanilla_invocations (ACE_ENV_SINGLE_ARG_DECL); + void vanilla_invocations (void); void priority_invocations (int debug ACE_ENV_ARG_DECL); @@ -116,9 +116,9 @@ public: void set_priority_bands (int debug ACE_ENV_ARG_DECL); - void set_private_connection_policies (ACE_ENV_SINGLE_ARG_DECL); + void set_private_connection_policies (void); - void reset_policies (ACE_ENV_SINGLE_ARG_DECL); + void reset_policies (void); private: @@ -142,7 +142,7 @@ public: int svc (void); - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); + void validate_connection (void); private: Client client_; @@ -165,7 +165,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager, } void -Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) +Worker_Thread::validate_connection (void) { // Try to validate the connection several times, ignoring transient // exceptions. If the connection can still not be setup, return @@ -180,7 +180,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ++current_attempt; this->test_->_validate_connection (inconsistent_policies.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If successful, we are done. return; @@ -198,7 +197,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -209,13 +207,10 @@ Worker_Thread::svc (void) { this->current_->the_priority (this->priority_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connection (); - this->client_.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->client_.vanilla_invocations (); } ACE_CATCHANY { @@ -240,12 +235,11 @@ Client::Client (test_ptr test, } void -Client::vanilla_invocations (ACE_ENV_SINGLE_ARG_DECL) +Client::vanilla_invocations (void) { for (int i = 0; i < iterations; i++) { - this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->test_->method (); } } @@ -329,7 +323,6 @@ Client::set_client_protocols_policies (int debug policies, debug ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -341,7 +334,6 @@ Client::set_client_protocols_policies (int debug this->policy_manager_->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -357,7 +349,6 @@ Client::set_priority_bands (int debug policies, debug ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -369,34 +360,30 @@ Client::set_priority_bands (int debug this->policy_manager_->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Client::set_private_connection_policies (ACE_ENV_SINGLE_ARG_DECL) +Client::set_private_connection_policies (void) { CORBA::PolicyList policies; policies.length (1); policies[0] = - this->rt_orb_->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->rt_orb_->create_private_connection_policy (); this->policy_manager_->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Client::reset_policies (ACE_ENV_SINGLE_ARG_DECL) +Client::reset_policies (void) { CORBA::PolicyList empty_policies; this->policy_manager_->set_policy_overrides (empty_policies, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } class Task : public ACE_Task_Base @@ -427,46 +414,37 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; current->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client client (test.in (), this->orb_.in (), @@ -474,78 +452,57 @@ Task::svc (void) rt_orb.in (), policy_manager.in ()); - client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.vanilla_invocations (); - client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.set_private_connection_policies (); - client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.vanilla_invocations (); - client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.reset_policies (); client.set_client_protocols_policies (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.vanilla_invocations (); - client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.set_private_connection_policies (); - client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.vanilla_invocations (); - client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.reset_policies (); client.set_priority_bands (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client.priority_invocations (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.set_private_connection_policies (); client.priority_invocations (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.reset_policies (); client.set_priority_bands (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client.set_client_protocols_policies (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client.priority_invocations (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.set_private_connection_policies (); client.priority_invocations (debug ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.reset_policies (); if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY @@ -570,7 +527,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int parse_args_result = parse_args (argc, argv); @@ -625,7 +581,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 234e6d3ef58..31433ff9507 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -30,13 +30,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: @@ -52,7 +52,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. @@ -77,7 +77,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -86,11 +86,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -157,7 +156,6 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; u_int result = 0; result = @@ -182,7 +180,6 @@ vanilla_poa (CORBA::ORB_ptr orb, CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -193,25 +190,21 @@ vanilla_poa (CORBA::ORB_ptr orb, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (orb, poa.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), orb ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -230,7 +223,6 @@ rt_poa (CORBA::ORB_ptr orb, policies, debug ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -253,7 +245,6 @@ rt_poa (CORBA::ORB_ptr orb, policies, debug ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -266,13 +257,11 @@ rt_poa (CORBA::ORB_ptr orb, rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Implicit_activation policy. CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -287,25 +276,21 @@ rt_poa (CORBA::ORB_ptr orb, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_i *servant = 0; ACE_NEW_THROW_EX (servant, test_i (orb, poa.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_this (); write_iors_to_file (test.in (), orb ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } class Task : public ACE_Task_Base @@ -336,48 +321,38 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); vanilla_poa (this->orb_.in (), root_poa.in (), poa_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; rt_poa (this->orb_.in (), rt_orb.in (), root_poa.in (), poa_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -399,7 +374,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index 425db1603fb..861a42c745c 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -67,23 +67,17 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::Mutex_var my_mutex; - my_mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_mutex = rt_orb->create_mutex (); - my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_mutex->lock (); - my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_mutex->unlock (); - my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_mutex->lock (); - my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + my_mutex->unlock (); rt_orb->destroy_mutex (my_mutex.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -111,7 +105,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) larry_mutex1 = rt_orb->create_named_mutex ("larry", created_flag ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (created_flag != 1) ACE_ERROR_RETURN ((LM_ERROR, @@ -121,18 +114,15 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) moe_mutex1 = rt_orb->create_named_mutex ("moe", created_flag ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (created_flag != 1) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: Expected named mutex moe to be created, but it wasn't\n"), -1); - larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex1->lock (); - larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex1->unlock (); // Test creating the mutex a second time { @@ -140,7 +130,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) larry_mutex2 = rt_orb->create_named_mutex ("larry", created_flag ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (created_flag != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -154,11 +143,9 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) "ERROR: Should have gotten the same mutex, but didn't\n"), -1); - larry_mutex2->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex2->lock (); - larry_mutex2->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex2->unlock (); } // test opening the mutex @@ -166,7 +153,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) RTCORBA::Mutex_var larry_mutex3; larry_mutex3 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // test the pointers... if (reinterpret_cast<void *> (larry_mutex1.in ()) @@ -175,25 +161,19 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) "ERROR: Should have gotten the same mutex, but didn't\n"), -1); - larry_mutex3->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex3->lock (); - larry_mutex3->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex3->unlock (); } // Make sure that nothing has been broken behind the scenes. - larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex1->lock (); - larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + larry_mutex1->unlock (); rt_orb->destroy_mutex (larry_mutex1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -218,7 +198,6 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb) RTCORBA::Mutex_var larry_mutex1; larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, "Expected a MutexNotFound exception, but didn't get one.\n"), @@ -269,7 +248,6 @@ mutex_test_thread (void *args) ACE_TEXT ("(%P|%t) = trying to lock on iteration %d\n"), i)); mutex->lock (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) = locked on iteration %d\n"), @@ -302,7 +280,6 @@ mutex_test_thread (void *args) *shared_var = 0; mutex->unlock (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) = unlocked on iteration %d\n"), @@ -335,8 +312,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb) ACE_TRY_NEW_ENV { - RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (); test_data.mutex = mutex; test_data.shared_var = &shared_var; @@ -381,7 +357,6 @@ mutex_test_try_lock_thread (void *args) // check that try_lock (0) returns false ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n")); result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result) { @@ -401,7 +376,6 @@ mutex_test_try_lock_thread (void *args) timer.start (); result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; timer.stop (); if (result) @@ -451,13 +425,11 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) ACE_TRY_NEW_ENV { - RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (); // Test out try_lock and keep the lock so that the spawned task // can test out try_lock failure cases result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!result) ACE_ERROR_RETURN ((LM_ERROR, "try_lock failed\n"), @@ -504,7 +476,6 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -513,10 +484,8 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 9ac3ce834d6..9ad9778c388 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -55,25 +55,22 @@ check_policy (Test_ptr server CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + priority_policy->priority_model (); if (priority_model != RTCORBA::SERVER_DECLARED) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: priority_model != " "RTCORBA::SERVER_DECLARED!\n"), -1); - return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (); } int @@ -86,7 +83,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -95,19 +91,15 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2. object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -117,7 +109,6 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Short server1_priority = check_policy (server1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server1_priority == -1) return -1; @@ -125,7 +116,6 @@ main (int argc, char *argv[]) // Test object 2. CORBA::Short server2_priority = check_policy (server2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server2_priority == -1) return -1; @@ -133,15 +123,12 @@ main (int argc, char *argv[]) for (int i = 0; i < 5; ++i) { server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Testing over. Shut down Server ORB. - server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->shutdown (); } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 6594427f846..8eb17270e82 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -21,7 +21,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -44,18 +44,15 @@ Test_i::test_method (CORBA::Short priority CORBA::Object_var obj = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (obj.in ())) ACE_THROW (CORBA::INTERNAL ()); CORBA::Short servant_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->the_priority (); // Print out the info. if (servant_thread_priority != priority) @@ -70,7 +67,7 @@ Test_i::test_method (CORBA::Short priority } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -174,17 +171,14 @@ create_object (RTPortableServer::POA_ptr poa, else id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -232,27 +226,22 @@ Task::svc (void) // RTORB. CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Create child POA with SERVER_DECLARED PriorityModelPolicy, // and MULTIPLE_ID id uniqueness policy (so we can use one @@ -263,23 +252,19 @@ Task::svc (void) rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, poa_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa_policy_list[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (rt_poa.in (), "RTPOA") == -1) return -1; @@ -291,7 +276,6 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "\nActivated object one as ")); result = create_object (rt_poa.in (), this->orb_.in (), &server_impl, -1, ior_output_file1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; @@ -299,17 +283,14 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "\nActivated object two as ")); result = create_object (rt_poa.in (), this->orb_.in (), &server_impl, object_priority, ior_output_file2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return -1; // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Start ORB event loop. - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } @@ -332,7 +313,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 7dd24cdb9b5..6ca122e99f7 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -62,8 +59,7 @@ main (int argc, char *argv[]) } // Make an invocation on the obtained Test object. - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 5ca5342d11e..7731d22334c 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -18,7 +18,7 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -102,12 +102,10 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, CORBA::Policy_var server_protocol = policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); RTCORBA::ServerProtocolPolicy_var policy = RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -115,8 +113,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, "is missing\n"), -1); - RTCORBA::ProtocolList_var protocols = policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + RTCORBA::ProtocolList_var protocols = policy->protocols (); ACE_DEBUG ((LM_DEBUG, "\nRoot POA ServerProtocolPolicy " @@ -137,7 +134,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_narrow (properties.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (tcp_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -160,7 +156,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, RTCORBA::UnixDomainProtocolProperties_var uiop_properties = RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (uiop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -175,7 +170,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, RTCORBA::SharedMemoryProtocolProperties_var shmem_properties = RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (shmem_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -202,7 +196,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, RTCORBA::UserDatagramProtocolProperties_var diop_properties = RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (diop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -215,7 +208,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, RTCORBA::StreamControlProtocolProperties_var sciop_properties = RTCORBA::StreamControlProtocolProperties::_narrow (properties.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (sciop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -246,18 +238,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -265,20 +254,16 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check ServerProtocol configurations. int result = check_server_protocol_at_root_poa (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return -1; @@ -300,7 +285,6 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_server_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa; @@ -311,30 +295,25 @@ main (int argc, char *argv[]) poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { poa = PortableServer::POA::_duplicate (root_poa.in ()); - ACE_TRY_CHECK; } Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var server = poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ())); @@ -351,11 +330,9 @@ main (int argc, char *argv[]) } // Run ORB Event loop. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 727015a2353..bb03fa95230 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -78,11 +78,9 @@ Task::svc (void) { CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; pid_t pid = ACE_OS::getpid (); @@ -93,7 +91,6 @@ Task::svc (void) test->method (pid, i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (r == i); // Assert disappears on with optimizations on. @@ -102,8 +99,7 @@ Task::svc (void) if (shutdown_server) { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->shutdown (); } } ACE_CATCHANY @@ -124,7 +120,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 5dd811de9bd..6b0cad7d3ab 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -66,7 +66,6 @@ write_ior_to_file (CORBA::ORB_ptr orb, CORBA::String_var ior = orb->object_to_string (test ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -110,7 +109,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Thread pool policy. policies[1] = @@ -121,7 +119,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the POA under the RootPOA. PortableServer::POA_var poa = @@ -129,15 +126,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, poa_manager, policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + policies[i]->destroy (); } test_i *servant = @@ -149,14 +144,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, ACE_UNUSED_ARG (safe_servant); test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + servant->_this (); int result = write_ior_to_file (orb, test.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return result; } @@ -189,59 +182,48 @@ Task::svc (void) CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::Priority default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + current->the_priority (); test_i servant (this->orb_.in (), root_poa.in (), nap_time); test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); int result = write_ior_to_file (this->orb_.in (), test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::ULong stacksize = 0; CORBA::Boolean allow_request_buffering = 0; @@ -257,12 +239,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_1 = rt_orb->create_threadpool_policy (threadpool_id_1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (1); @@ -280,12 +260,10 @@ Task::svc (void) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_2 = rt_orb->create_threadpool_policy (threadpool_id_2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -295,7 +273,6 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; @@ -307,15 +284,12 @@ Task::svc (void) this->orb_.in (), rt_orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result != 0) return result; - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -338,7 +312,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index aab3f451e2b..6bf036e1119 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -50,16 +50,15 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index 14234e78d65..5a3507aa59e 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -26,11 +26,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Our POA. - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: /// ORB. diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index 3085aa72bcb..f5e1ca5729b 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -99,7 +99,6 @@ get_priority_bands (const char *test_type, CORBA::Policy_var banded_connection_policy = rt_orb->create_priority_banded_connection_policy (bands ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -240,12 +239,10 @@ get_priority_lanes (const char *test_type, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -291,7 +288,6 @@ get_protocols (const char *test_type, CORBA::Policy_var protocol_policy = rt_orb->create_client_protocol_policy (protocols ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -371,18 +367,15 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_priority_banded_connection_policy (bands ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index a12629ada7b..6cf0763f9bf 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -27,11 +27,9 @@ Thread_Task::activate_task (int thr_count) CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->current_ = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char * name = 0; CORBA::Policy_ptr sched_param = 0; @@ -112,7 +110,6 @@ Thread_Task::svc (void) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; size_t count = 0; ACE_OS::memcpy (&count, @@ -128,19 +125,16 @@ Thread_Task::svc (void) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; //Start - Nested Scheduling Segment this->current_->begin_scheduling_segment ("The Return of the King", sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTScheduling::Current::NameList_var segment_name_list = - this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->current_->current_scheduling_segment_names (); { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *lock_, -1); @@ -158,16 +152,13 @@ Thread_Task::svc (void) this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; //End - Nested Scheduling Segment this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; //End - Nested Scheduling Segment ACE_DEBUG ((LM_DEBUG, @@ -184,7 +175,6 @@ Thread_Task::svc (void) ACE_OS::sleep (1); orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } } diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp index ffcf6dbf8a3..829e485e925 100644 --- a/TAO/tests/RTScheduling/Current/test.cpp +++ b/TAO/tests/RTScheduling/Current/test.cpp @@ -14,15 +14,12 @@ main (int argc, char* argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Scheduler scheduler (orb.in ()); @@ -32,14 +29,12 @@ main (int argc, char* argv []) task.activate_task (4); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // Wait until all threads are ready. ACE_Thread_Manager::instance ()->wait (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index 37da9a5de01..0ad5e1164da 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -53,8 +53,7 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data count)); RTScheduling::Current::NameList_var segment_name_list = - tmp->current->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + tmp->current->current_scheduling_segment_names (); ACE_DEBUG ((LM_DEBUG, "Segment Names for DT %d:\n", diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp index fab57bcd8ce..c38fb84ebab 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp +++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp @@ -11,7 +11,7 @@ main (int argc, char* argv []) { CORBA::ORB_var orb; RTScheduling::Current_var current; - + const char * name = 0; CORBA::Policy_ptr sched_param = 0; CORBA::Policy_ptr implicit_sched_param = 0; @@ -24,15 +24,12 @@ main (int argc, char* argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Scheduler* scheduler; ACE_NEW_RETURN (scheduler, @@ -44,12 +41,10 @@ main (int argc, char* argv []) CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + current = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ACE_TRY_EX (block1) { @@ -78,7 +73,7 @@ main (int argc, char* argv []) "\n"); } ACE_ENDTRY; - + ACE_DEBUG ((LM_DEBUG, "Start - Scheduling Segment...\n")); @@ -86,22 +81,21 @@ main (int argc, char* argv []) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + size_t count = 0; ACE_OS::memcpy (&count, current->id ()->get_buffer (), current->id ()->length ()); - + ACE_DEBUG ((LM_DEBUG, "The Current DT Guid is %d\n", count)); - + //Initialize data to be passed to the Thread_Action::do method Data spawn_data; spawn_data.data = "Harry Potter"; spawn_data.current = RTScheduling::Current::_duplicate (current.in ()); - + ACE_DEBUG ((LM_DEBUG, "Spawning a new DT...\n")); RTScheduling::DistributableThread_var dt = @@ -113,25 +107,23 @@ main (int argc, char* argv []) 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + current->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "End - Scheduling Segment %d\n", count)); - - } + + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught Exception\n"); } - ACE_ENDTRY; - + ACE_ENDTRY; + ACE_Thread_Manager::instance ()->wait (); - + return 0; } diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index 885e7ba2fd7..d2a55f7d2e4 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -10,11 +10,9 @@ TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; current_ = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_Scheduler::~TAO_Scheduler (void) @@ -22,7 +20,7 @@ TAO_Scheduler::~TAO_Scheduler (void) } CORBA::PolicyList* -TAO_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Scheduler::scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -36,14 +34,14 @@ TAO_Scheduler::scheduling_policies (const CORBA::PolicyList & } CORBA::PolicyList* -TAO_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Scheduler::poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * -TAO_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Scheduler::scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -128,9 +126,8 @@ TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ srv_con->context_id = Client_Interceptor::SchedulingInfo; srv_con->context_data.length (sizeof (size_t)); ACE_OS::memcpy (srv_con->context_data.get_buffer (), - current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (), + current_->id ()->get_buffer (), sizeof (size_t)); - ACE_CHECK; request_info->add_request_service_context (*srv_con, 0); } @@ -151,7 +148,6 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque { serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; size_t gu_id; ACE_OS::memcpy (&gu_id, diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h index c54895ac089..6444d869b56 100644 --- a/TAO/tests/RTScheduling/Scheduler.h +++ b/TAO/tests/RTScheduling/Scheduler.h @@ -15,17 +15,17 @@ public RTScheduling::Scheduler, ~TAO_Scheduler (void); - virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 14c947939fb..6131ba2554e 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp @@ -49,18 +49,15 @@ main (int argc, char* argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) return (-1); CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Scheduler* scheduler; ACE_NEW_RETURN (scheduler, @@ -74,11 +71,9 @@ main (int argc, char* argv []) CORBA::Object_var object = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -90,11 +85,9 @@ main (int argc, char* argv []) CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char * name = 0; CORBA::Policy_ptr sched_param = 0; @@ -104,7 +97,6 @@ main (int argc, char* argv []) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Making a one-way request\n")); @@ -114,11 +106,9 @@ main (int argc, char* argv []) "Making a two-way request\n")); server->two_way (ior.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; current->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex) diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index 73e333552ca..a95aec8680a 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -11,14 +11,14 @@ const char* filename = "test.ior"; class test_impl : public POA_test { public: - + test_impl (CORBA::ORB_ptr orb, RTScheduling::Current_ptr current) - : orb_ (orb), + : orb_ (orb), current_ (RTScheduling::Current::_duplicate (current)) { } - + virtual void one_way (const char * message ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -27,7 +27,7 @@ public: "One-Way Message = %s\n", message)); } - + virtual char * two_way (const char * message ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -35,19 +35,17 @@ public: ACE_DEBUG ((LM_DEBUG, "Two-Way Message = %s\n", message)); - - RTScheduling::DistributableThread_var DT = + + RTScheduling::DistributableThread_var DT = this->current_->lookup (*(this->current_->id ()) ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - + + DT->cancel (); + return CORBA::string_dup (message); } - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (); @@ -58,7 +56,7 @@ private: RTScheduling::Current_var current_; }; -int +int parse_args (int argc, ACE_TCHAR* argv []) { @@ -91,77 +89,65 @@ main (int argc, char* argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; parse_args (argc, argv); CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + root_poa->the_POAManager (); + + poa_manager->activate (); + CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_impl* test_i; ACE_NEW_RETURN (test_i, test_impl (orb.in (), current.in ()), -1); - + PortableServer::ObjectId_var id; - + id = root_poa->activate_object (test_i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var server = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior; if (!CORBA::is_nil (server.in ())) { ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - else + else { ACE_ERROR_RETURN ((LM_ERROR, "Failed to activate test object\n"), -1); } - + ACE_DEBUG ((LM_DEBUG, "IOR = %s\n", ior.in ())); CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Scheduler scheduler (orb.in ()); manager->rtscheduler (&scheduler); @@ -187,7 +173,7 @@ main (int argc, char* argv[]) "Caught exception:"); return 1; } - ACE_ENDTRY; + ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 9ad3f1430d0..809bf443127 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -31,11 +31,9 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->current_ = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -76,7 +74,6 @@ Thread_Task::svc (void) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; size_t count = 0; ACE_OS::memcpy (&count, @@ -88,7 +85,6 @@ Thread_Task::svc (void) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->guid_[guid_index++] = *(this->current_->id ()); @@ -97,13 +93,11 @@ Thread_Task::svc (void) sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *shutdown_lock_,-1); - RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names (); ACE_DEBUG ((LM_DEBUG, "Scheduling Segments for DT %d :\n", @@ -121,19 +115,16 @@ Thread_Task::svc (void) this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // End - Nested Scheduling Segment this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // End - Nested Scheduling Segment this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp index 42a390c4b01..91e651ff7eb 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp @@ -16,15 +16,12 @@ main (int argc, char* argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_Scheduler scheduler (orb.in ()); @@ -46,20 +43,16 @@ main (int argc, char* argv []) CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (int i = 0; i < 4; i++) { RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + DT->cancel (); } orb->run (); diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp index 087080ddbba..3d3f66b1056 100644 --- a/TAO/tests/RTScheduling/VoidData/test_client.cpp +++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp @@ -13,7 +13,6 @@ main (int argc, char* argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_impl foo_i; int something = 28; diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp index 106c14a0ec0..6f8a4d665cc 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -12,38 +12,34 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb) } void -Oneway_Receiver::raise_no_permission (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::raise_no_permission (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::NO_PERMISSION ()); } void -Oneway_Receiver::destroy (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Test::Shutdown_Helper_ptr -Oneway_Receiver::get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::get_shutdown_helper (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Shutdown_Helper *shutdown_helper; ACE_NEW_THROW_EX (shutdown_helper, Shutdown_Helper (this->orb_.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Shutdown_Helper::_nil ()); PortableServer::ServantBase_var transfer_ownership(shutdown_helper); - return shutdown_helper->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return shutdown_helper->_this (); } diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index fdf0a36b9c5..0f7cadff68f 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -17,13 +17,13 @@ public: Oneway_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void raise_no_permission (ACE_ENV_SINGLE_ARG_DECL) + virtual void raise_no_permission (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Test::Shutdown_Helper_ptr get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL) + virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index 38ffc90ed4b..a206f5e0d4d 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -11,7 +11,7 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) } void -Shutdown_Helper::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Shutdown_Helper::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index e4b764f3497..935bd5d96aa 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -17,7 +17,7 @@ public: Shutdown_Helper (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index 259e1be4ea6..719c4e87713 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -87,18 +87,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Oneway_Receiver_var oneway_receiver = Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (oneway_receiver.in ())) { @@ -113,35 +110,30 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n")); run_test_sync_with_target (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (test_sync_with_server) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_SERVER\n")); run_test_sync_with_server (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else if (test_sync_with_transport) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TRANSPORT\n")); run_test_sync_with_transport (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n")); run_test_sync_none (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Run the orb for 3 seconds, this way we make sure things are flushed // to the transport. ACE_Time_Value time (3, 0); orb->run (time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (successful_calls == 0) ACE_ERROR ((LM_ERROR, "ERROR: No requests were successful\n")); @@ -155,8 +147,7 @@ main (int argc, char *argv[]) "ERROR: Mismatched number of calls (%d + %d != %d)\n", successful_calls, failed_calls, iterations)); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -175,15 +166,12 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope { int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (policy_current.in ())) { @@ -198,14 +186,11 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[0]->destroy (); } void @@ -220,15 +205,13 @@ run_one_iteration (int i, { ACE_DEBUG ((LM_DEBUG, "Destroying object\n")); server_status = DESTROYED; - oneway_receiver->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_receiver->destroy (); } if (i == 2 * iterations / 3) { ACE_DEBUG ((LM_DEBUG, "Shutting down server process\n")); server_status = SHUTDOWN; - shutdown_helper->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + shutdown_helper->shutdown (); } } ACE_CATCHANY @@ -236,8 +219,7 @@ run_one_iteration (int i, } ACE_ENDTRY; - oneway_receiver->raise_no_permission (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + oneway_receiver->raise_no_permission (); } /// Helper routine to set breakpoints during failures @@ -254,11 +236,9 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver ACE_ENV_ARG_DECL) { set_sync_scope_policy (Messaging::SYNC_WITH_TARGET ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + oneway_receiver->get_shutdown_helper (); int had_comm_failure = 0; for (int i = 0; i != iterations; ++i) @@ -267,7 +247,6 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver { run_one_iteration (i, oneway_receiver, shutdown_helper.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::NO_PERMISSION, ex) { @@ -311,11 +290,9 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver ACE_ENV_ARG_DECL) { set_sync_scope_policy (Messaging::SYNC_WITH_SERVER ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + oneway_receiver->get_shutdown_helper (); int had_comm_failure = 0; for (int i = 0; i != iterations; ++i) @@ -324,7 +301,6 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver { run_one_iteration (i, oneway_receiver, shutdown_helper.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server_status == DESTROYED || server_status == SHUTDOWN) @@ -376,10 +352,8 @@ run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver ACE_ENV_ARG_DECL) { set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -387,10 +361,8 @@ run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver ACE_ENV_ARG_DECL) { set_sync_scope_policy (Messaging::SYNC_NONE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -399,8 +371,7 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver ACE_ENV_ARG_DECL) { Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + oneway_receiver->get_shutdown_helper (); int undetected = 0; int had_transient = 0; @@ -410,7 +381,6 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver { run_one_iteration (i, oneway_receiver, shutdown_helper.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // A few failures can go undetected... if (server_status == SHUTDOWN) diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 05aa3251a36..0aad3f78121 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -41,15 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +54,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -70,12 +66,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + oneway_receiver_impl->_this (); CORBA::String_var ior = orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp index 6095fe48373..2ca4fe3f756 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp @@ -11,7 +11,7 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb) } char * -One_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +One_Impl::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("One_Impl there!"); @@ -23,7 +23,7 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb) } char * -Two_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Two_Impl::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("One_Impl there!"); @@ -36,7 +36,7 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb) } char * -Three_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Three_Impl::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Three_Impl there!"); diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h index 4ff3dd09b6e..c514c184b73 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.h +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h @@ -16,7 +16,7 @@ public: One_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -33,7 +33,7 @@ public: Two_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -50,7 +50,7 @@ public: Three_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 65139d0cd63..48f6c622aa9 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -48,17 +48,14 @@ MT_Task::svc (void) CORBA::Object_var one_ref = this->p_->servant_to_reference (this->one_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var two_ref = this->p_->servant_to_reference (this->two_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var three_ref = this->p_->servant_to_reference (this->three_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -67,7 +64,6 @@ MT_Task::svc (void) "(%P|%t) Caugh exception \n"); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -105,15 +101,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -121,8 +114,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -153,23 +145,19 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = first_poa->activate_object (one_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = first_poa->activate_object (two_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid3 = first_poa->activate_object (three_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; MT_Task task (first_poa.in (), @@ -185,16 +173,13 @@ main (int argc, char *argv[]) task.thr_mgr ()->wait (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index 52c7b5e6395..b48db4e4d30 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -36,15 +36,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,8 +49,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -65,12 +61,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -82,21 +76,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Time_Value tv (120, 0); orb->run (&tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index 31cf7652b1a..32b443fe813 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -11,13 +11,13 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb) } void -Ping_Service::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Ping_Service::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Ping_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Ping_Service::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index 8136914b8ce..cf83b5bc6d9 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -17,10 +17,10 @@ public: Ping_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index c8263903192..2c42c726a34 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -46,18 +46,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Ping_Service_var ping_service = Test::Ping_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ping_service.in ())) { @@ -69,18 +66,15 @@ main (int argc, char *argv[]) for (int i = 0; i != 10; ++i) { - ping_service->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ping_service->ping (); } if (do_shutdown) { - ping_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ping_service->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 0a037cdb95d..7cbf40f1aeb 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -40,15 +40,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +53,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -69,12 +65,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(ping_service_impl); Test::Ping_Service_var ping_service = - ping_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ping_service_impl->_this (); CORBA::String_var ior = orb->object_to_string (ping_service.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,19 +80,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp index 457b7da1064..488ed116010 100644 --- a/TAO/tests/Server_Port_Zero/Hello.cpp +++ b/TAO/tests/Server_Port_Zero/Hello.cpp @@ -13,14 +13,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/Server_Port_Zero/Hello.h +++ b/TAO/tests/Server_Port_Zero/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 4375a5c4b06..2988d821eae 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,21 +83,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Time_Value tv (3, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index 7e69d9350cf..8beb519c4a0 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -81,7 +81,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -92,12 +91,10 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Try to narrow the object reference to a <test> reference. test_var test_object = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test::data the_data0 (data_bytes); the_data0.length (data_bytes); @@ -120,19 +117,16 @@ main (int argc, char **argv) test_object->method (i, the_data0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke the oneway method. test_object->method (i, the_data1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke the oneway method. test_object->method (i, the_data2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Shutdown server. @@ -140,8 +134,7 @@ main (int argc, char **argv) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending a shutdown call..\n")); - test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object->shutdown (); } // Destroy the ORB. On some platforms, e.g., Win32, the socket @@ -150,8 +143,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -161,7 +153,6 @@ main (int argc, char **argv) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 20af40930ea..19cd706fd45 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -44,21 +44,17 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return -1; @@ -66,13 +62,11 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -85,18 +79,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index 5125a7c9c22..a35c4c057e4 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -28,7 +28,7 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index 39387592b14..6326e295cdd 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -33,7 +33,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 949c299e773..766e16bd8bd 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -28,13 +28,12 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::box_prices (ACE_ENV_SINGLE_ARG_DECL) +Smart_Test_Proxy::box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->price_ == 0) { - this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (); } return this->price_; } diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index b3ac7e0c5d9..a9702e0cc56 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -17,7 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short box_prices(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short box_prices(void) ACE_THROW_SPEC ((CORBA::SystemException)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 34732cdac90..6a61bacafdb 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -124,7 +124,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -132,7 +131,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (register_smart_proxy == 1) { // To use the smart proxy it is necessary to allocate the @@ -154,7 +152,6 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -177,8 +174,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price = server->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + price = server->box_prices (); if (price < 300) cost = server->tickets (5); @@ -190,21 +186,18 @@ main (int argc, char *argv[]) marker.sample (now - throughput_base, now - latency_base); - ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } marker.dump_stats ("buying tickets ", gsf); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); /* Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -227,8 +220,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price1 = server1->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + price1 = server1->box_prices (); if (price1 < 300) cost = server1->tickets (5); @@ -240,15 +232,13 @@ main (int argc, char *argv[]) marker.sample (now - throughput_base1, now - latency_base); - ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } marker1.dump_stats ("buying tickets using a default proxy ", gsf1); - server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->shutdown (); */ } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index ca2acbcbec2..e16d114222e 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -29,14 +29,14 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short box_prices (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Short box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long tickets (CORBA::Short number ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -50,7 +50,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i::box_prices (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 125; @@ -65,7 +65,7 @@ Test_i::tickets (CORBA::Short number } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -112,34 +112,28 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -159,11 +153,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -171,7 +163,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp index fce6e571c50..2442eee0e51 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp @@ -26,7 +26,6 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB. this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); int result = this->parse_args (argc, argv); if (result != 0) @@ -35,52 +34,42 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) // Get an Object reference to RootPOA. CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Narrow the Object reference to a POA reference this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get the POAManager of RootPOA this->poa_manager_ = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->root_poa_->the_POAManager (); // Activate the diamond servant and its base classes under RootPOA. PortableServer::ObjectId_var id = this->root_poa_->activate_object (&this->top_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // // We only care about the most derived class here. -// this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); -// ACE_CHECK_RETURN (-1); +// this->diamond_obj_ = this->diamond_servant_._this (); id = this->root_poa_->activate_object (&this->diamond_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // We only care about the most derived class here. this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->left_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->right_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::String_var str = this->orb_->object_to_string (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", str.in())); @@ -99,7 +88,7 @@ Collocation_Test::parse_args (int argc, char *argv[]) } int -Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Test::test_narrow (void) { // Ensure that the smart proxy is the one which is used by registering // the user-defined factory. Its necessary to create one on the heap so @@ -111,47 +100,37 @@ Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL) Diamond::Top_var top = Diamond::Top::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Left_var left = Diamond::Left::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Right_var right = Diamond::Right::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Diamond::Buttom_var buttom = Diamond::Buttom::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + CORBA::String_var str = top->shape (); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); - str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = left->shape (); ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ())); - str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = right->shape (); ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ())); - str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + str = buttom->shape (); ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ())); return 0; } int -Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL) +Collocation_Test::run (void) { - this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->poa_manager_->activate (); - this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->test_narrow (); return 0; } diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h index 9e91a8f045b..af950ec9cec 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h @@ -34,11 +34,11 @@ public: int parse_args (int argc, char *argv[]); // Parse the test specific arguments. - int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int test_narrow (void); // This test narrow an object reference to its base class and see // if it works correctly. - int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int run (void); // Run the test. private: diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp index f94a35d2c4b..1aed52ccf2f 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Top_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::width (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::shape (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::color (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::width (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::name (void) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h index 853f34ff03d..6200a2ec1d3 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h @@ -17,7 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char* shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -29,11 +29,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -45,15 +45,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -65,19 +65,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index 8de0a3ed17d..d8d6d3aa4bc 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -46,7 +46,6 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_SINGLE_ARG_PARAMETER ) ); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", ans)); } diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp index dff11cb451f..0494c5f5b7a 100644 --- a/TAO/tests/Smart_Proxies/Collocation/main.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp @@ -12,10 +12,8 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + coll_test.run (); } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp index 62e5232517a..569ec789b91 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp @@ -20,7 +20,6 @@ Smart_Test_Proxy::method (CORBA::Short boo { retval = TAO_Test_Smart_Proxy_Base::method (boo ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) { diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 2ba4e74ca80..1f69262842d 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -60,7 +60,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -68,7 +67,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // To use the smart proxy just enter it as a svc.conf // entry. @@ -76,7 +74,6 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -86,9 +83,8 @@ main (int argc, char *argv[]) server->method (0); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 5f0ebde1ffa..583cc64c268 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -34,7 +34,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,7 +63,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); @@ -110,34 +110,28 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -157,18 +151,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp index 4123f962892..2b9bc6ff99d 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp @@ -42,7 +42,6 @@ Smart_Test_Proxy::method (CORBA::Short boo { retval = TAO_Test_Smart_Proxy_Base::method (boo ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) { diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index a54fa3856f3..2dd2519cdaa 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -70,20 +70,17 @@ run_test (CORBA::ORB_ptr orb_ptr, object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -92,8 +89,7 @@ run_test (CORBA::ORB_ptr orb_ptr, server->method (0); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { @@ -114,7 +110,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -139,7 +134,6 @@ main (int argc, char *argv[]) run_test (orb.in (), 1); run_test (orb.in (), 2); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 7e000c323d3..027b6855313 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -34,7 +34,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,7 +63,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -110,34 +110,28 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -157,11 +151,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -169,7 +161,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index b2bd94142ee..ebb632a5b9e 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -59,7 +59,6 @@ Smart_Test_Proxy::method (CORBA::Short boo { retval = TAO_Test_Smart_Proxy_Base::method (boo ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) { diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index 2fc36491398..d4e304f9c11 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -62,7 +62,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -70,7 +69,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // To use the smart proxy it is necessary to allocate the // user-defined smart factory on the heap as the smart proxy @@ -89,7 +87,6 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -118,10 +115,8 @@ main (int argc, char *argv[]) } server->method (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); // The following sleep is a hack to make sure the above oneway // request gets sent before we exit. Otherwise, at least on @@ -129,8 +124,7 @@ main (int argc, char *argv[]) ACE_Time_Value tv (0, 100000); ACE_OS::sleep(tv); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp index 47c2c88884b..29d339a3a31 100644 --- a/TAO/tests/Smart_Proxies/dtor/client.cpp +++ b/TAO/tests/Smart_Proxies/dtor/client.cpp @@ -41,14 +41,12 @@ int main (int argc, char* argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // force a scope to see the destruction of the server object { @@ -62,7 +60,6 @@ int main (int argc, char* argv[]) Test_var server = Test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -77,8 +74,7 @@ int main (int argc, char* argv[]) // Testing the _non_existent function ACE_DEBUG ((LM_DEBUG, "Testing _non_existent()\n")); CORBA::Boolean ne = - server->_non_existent(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->_non_existent(); if (ne) ACE_ERROR_RETURN ((LM_ERROR, "Not a Messenger object reference\n"), @@ -87,8 +83,7 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG,"Successfully called _non_existent()\n")); #endif /* TAO_HAS_MINIMUM_CORBA */ - server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown(); // The following sleep is a hack to make sure the above oneway // request gets sent before we exit. Otherwise, at least on @@ -102,8 +97,7 @@ int main (int argc, char* argv[]) "The Smart proxy is not deleted\n"),1); } - orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy(); } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index fa9eadf988b..e835df199e1 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -13,7 +13,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -34,7 +34,7 @@ Test_i::hello (CORBA::Long howmany } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -77,7 +77,6 @@ int main (int argc, char* argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -85,19 +84,15 @@ int main (int argc, char* argv[]) // Obtain RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA PortableServer::POAManager_var poa_mgr = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_mgr->activate (); // Create a servant Test_i servant (orb.in ()); @@ -105,16 +100,13 @@ int main (int argc, char* argv[]) PortableServer::ObjectId_var oid = root_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; obj = root_poa->id_to_reference (oid.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -134,18 +126,15 @@ int main (int argc, char* argv[]) else ACE_ERROR_RETURN ((LM_ERROR,"ior file name is null\n"),1); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 0fc44b24f0f..b4a86a45b7e 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -34,7 +34,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,7 +63,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -107,7 +107,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -117,27 +116,22 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -157,21 +151,17 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp index 58747bad1e4..a1ab6b34212 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.cpp +++ b/TAO/tests/Stack_Recursion/Client_Task.cpp @@ -27,8 +27,7 @@ Client_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->validate_connections (); for (int i = 0; i != this->event_count_; ++i) { @@ -43,7 +42,6 @@ Client_Task::svc (void) this->sender_->get_data (this->event_size_, payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -57,14 +55,13 @@ Client_Task::svc (void) void -Client_Task::validate_connections (ACE_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connections (void) { for (int i = 0 ; i != 100; i++) { ACE_TRY { - this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sender_->ping (); } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h index b52629ef5af..1858bf6c12c 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.h +++ b/TAO/tests/Stack_Recursion/Client_Task.h @@ -30,7 +30,7 @@ public: private: /// Simple pings to prune up the connections - void validate_connections (ACE_ENV_SINGLE_ARG_DECL); + void validate_connections (void); private: /// Reference to the test interface diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp index 7f897c4deee..49325025f7c 100644 --- a/TAO/tests/Stack_Recursion/Sender.cpp +++ b/TAO/tests/Stack_Recursion/Sender.cpp @@ -53,7 +53,7 @@ Sender::get_data (CORBA::ULong size, } CORBA::Long -Sender::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Sender::get_event_count (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, @@ -65,14 +65,14 @@ Sender::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Sender::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Sender::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return; } void -Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Sender::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->is_done_ == false) diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index be1663cabe6..07ed0952024 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -31,13 +31,13 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_event_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp index 9961c2fde5e..83b28ef8c43 100644 --- a/TAO/tests/Stack_Recursion/Server_Task.cpp +++ b/TAO/tests/Stack_Recursion/Server_Task.cpp @@ -30,7 +30,6 @@ Server_Task::svc (void) // run the test for at most 120 seconds... ACE_Time_Value tv (240, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index b9db252871c..235fe7ce2d6 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -41,18 +41,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Sender_var sender = Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) { @@ -75,20 +72,17 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); CORBA::Long count = - sender->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sender->get_event_count (); ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n", count)); // shutdown the remote ORB - sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sender->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index baa7bca0b5d..134ec55166b 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -42,11 +42,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,11 +53,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -71,13 +67,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); Test::Sender_var sender = - sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sender_impl->_this (); CORBA::String_var ior = orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,8 +83,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Server_Task server_task (orb.in (), sender_impl, @@ -107,10 +100,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index a554f94fea5..a6e68947d1c 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -68,18 +68,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -91,8 +88,7 @@ main (int argc, char *argv[]) // Invoke a request on the server CORBA::Boolean ret_value = - server->print_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->print_status (); if (ret_value == 0) { @@ -103,12 +99,10 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index 9e1de742de4..fdeefc29ba0 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,11 +51,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -65,12 +61,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,19 +81,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index 2e695e7fbd1..aa869165adf 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(tests, simple_test_i, "$Id$") CORBA::Boolean -Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::print_status (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -20,7 +20,7 @@ Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h index c9cb80d4476..bb4e73a24e3 100644 --- a/TAO/tests/Strategies/simple_test_i.h +++ b/TAO/tests/Strategies/simple_test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean print_status (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 1773da31417..a907386b8a8 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -139,20 +139,16 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, rt_timeout_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object_temp = object->_set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; object_with_policy = test::_narrow (object_temp.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); } Messaging::SyncScope sync = @@ -166,20 +162,16 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object_temp = object_with_policy->_set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; test_var object_with_two_policies = test::_narrow (object_temp.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); return object_with_two_policies._retn (); } @@ -197,7 +189,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -208,18 +199,15 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Try to narrow the object reference to a <test> reference. test_var test_object_no_policy = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Setup buffering and timeout test_var test_object = setup_policies (orb.in (), test_object_no_policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test::data the_data (data_bytes); the_data.length (data_bytes); @@ -233,7 +221,6 @@ main (int argc, char **argv) the_data, work ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Time_Value end = ACE_OS::gettimeofday (); @@ -247,12 +234,10 @@ main (int argc, char **argv) // If we don't run the orb, then no data will be sent, and no // connection will be made initially. orb->run (sleep_interval ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "client: flushing\n")); - test_object_no_policy->flush (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object_no_policy->flush (); ACE_DEBUG ((LM_DEBUG, "client: Shutting down...\n")); if (shutdown_server) @@ -260,11 +245,9 @@ main (int argc, char **argv) ACE_DEBUG ((LM_DEBUG,"client killing server\n")); long now = ACE_OS::gettimeofday ().msec (); test_object_no_policy->shutdown (now ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy the ORB. On some platforms, e.g., Win32, the socket // library is closed at the end of main(). This means that any @@ -272,8 +255,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -283,7 +265,6 @@ main (int argc, char **argv) } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 19009369e80..13bdec2868b 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -44,21 +44,17 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return -1; @@ -66,13 +62,11 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -85,18 +79,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index b29d2773ea3..8734af8fd5e 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -35,7 +35,7 @@ test_i::method (CORBA::ULong request_number, } void -test_i::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::flush (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server: got flush request\n")); @@ -50,5 +50,4 @@ test_i::shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n", (ACE_OS::gettimeofday() - start).msec ())); this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h index ef92af5e074..3698e023a54 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.h +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h @@ -36,7 +36,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void flush (ACE_ENV_SINGLE_ARG_DECL) + void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL) diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 9a7d1fe603c..a069f22777f 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -63,7 +63,6 @@ send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb, ACE_TRY { server->echo (0, t ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; in_time_count[ctype]++; } @@ -83,7 +82,6 @@ send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb, // client ORB a chance to cleanup the reply that's come back // from the server. orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_ENDTRY; } @@ -95,18 +93,15 @@ int main (int argc, char* argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -119,20 +114,16 @@ int main (int argc, char* argv[]) object = orb->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TimeBase::TimeT mid_value = 10000 * (min_timeout + max_timeout) / 2; // convert from msec to "TimeT" (0.1 usec units) @@ -150,19 +141,15 @@ int main (int argc, char* argv[]) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = server->_set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var timeout_server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); ACE_DEBUG ((LM_DEBUG, @@ -182,14 +169,11 @@ int main (int argc, char* argv[]) policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; send_echo (none, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; @@ -202,18 +186,14 @@ int main (int argc, char* argv[]) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_orb ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; send_echo (orb1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[0]->destroy (); @@ -229,18 +209,14 @@ int main (int argc, char* argv[]) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_thread ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; send_echo (thread1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy_list[0]->destroy (); @@ -251,7 +227,6 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "client(%P) Use the object policies\n")); send_echo (object1, orb.in (), timeout_server.in (), t ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, @@ -261,17 +236,13 @@ int main (int argc, char* argv[]) policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; send_echo (none, orb.in (), server.in (), 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); int timeout_count_total = 0; int in_time_count_total = 0; @@ -294,8 +265,7 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "in_time_count_total = %d, timeout_count_total = %d\n", in_time_count_total, timeout_count_total)); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 3fd05a6c9db..77bb03774c2 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -42,14 +42,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,21 +56,17 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -89,11 +83,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index d145a925fd4..aa56ccb5862 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -39,7 +39,7 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h index 00018fa25d8..3a8aecfe32c 100644 --- a/TAO/tests/Timeout/test_i.h +++ b/TAO/tests/Timeout/test_i.h @@ -35,7 +35,7 @@ public: CORBA::Long msecs ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index 63ed4f9c5ef..14f83c66ad7 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -22,14 +22,14 @@ Current_Test_Impl::~Current_Test_Impl (void) } ::CORBA::Long -Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +Current_Test_Impl::self_test (void) ACE_THROW_SPEC ((::CORBA::SystemException)) { return 0; } void -Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::test_transport_current (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { @@ -40,29 +40,22 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var tcobject = orb_->resolve_initial_references ("TAO::Transport::Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO::Transport::Current_var tc = TAO::Transport::Current::_narrow (tcobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (TAO_debug_level >= 1) { - ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + ::CORBA::Long id = tc->id (void); - ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + ::TAO::CounterT bs = tc->bytes_sent (void); - ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + ::TAO::CounterT br = tc->bytes_received (void); - ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + ::TAO::CounterT rs = tc->messages_sent (void); - ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + ::TAO::CounterT rr = tc->messages_received (void); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Current_Test_Impl (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), @@ -80,13 +73,12 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) } void -Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::invoked_by_client (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->invoked_by_client_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->invoked_by_client_i (); } ACE_CATCH (TAO::Transport::NoContext, ex) { @@ -102,7 +94,7 @@ Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) } void -Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::invoked_by_client_i (void) ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext)) { if (TAO_debug_level > 2) { @@ -110,20 +102,17 @@ Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) server - Testing inside an upcall\n"))); } - this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + this->test_transport_current (void); if (this->do_collocated_calls_) { CORBA::Object_var selfobject = poa_->servant_to_reference (this ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; Test::Transport::CurrentTest_var self = Test::Transport::CurrentTest::_narrow (selfobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (TAO_debug_level >= 1) { @@ -131,7 +120,6 @@ Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) server - Testing a collocated call\n"))); } self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -144,7 +132,7 @@ Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL) } void -Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Current_Test_Impl::invoked_during_upcall (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { @@ -156,7 +144,7 @@ Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp index eef52de80fa..2746c9f04e9 100644 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp @@ -14,20 +14,15 @@ test_transport_current (Transport::Current_ptr tc ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { - CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Long id = tc->id (); - TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO::CounterT bs = tc->bytes_sent (); - TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO::CounterT br = tc->bytes_received (); - TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO::CounterT rs = tc->messages_sent (); - TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO::CounterT rr = tc->messages_received (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Tester (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), @@ -50,12 +45,10 @@ test_transport_current (CORBA::ORB_ptr orb CORBA::Object_var tcobject = orb->resolve_initial_references ("TAO::Transport::Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Transport::Current_var tc = Transport::Current::_narrow (tcobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (CORBA::is_nil (tc.in ())) { diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index db5e5ac2a30..1d2d4c20578 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -126,12 +126,10 @@ Worker::svc (void) CORBA::Request_var request = this->server_->_request ("invoked_by_client" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; request->set_return_type (CORBA::_tc_void); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + request->invoke (); } #endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ @@ -139,8 +137,7 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); - this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->invoked_by_client (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"), @@ -181,14 +178,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, CLIENT_ORB_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -200,7 +195,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client (%P|%t) ERROR: ") @@ -220,11 +214,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Resolve the target object CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Transport::CurrentTest_var server = Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -275,8 +267,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); // Self-test the server side - result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = server->self_test (); if (result != 0) ACE_ERROR ((LM_ERROR, @@ -285,13 +276,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking orb->destroy ()\n"))); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Completed %s.\n"), diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 2e551ae6961..9e5ede623f8 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -87,8 +87,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -123,24 +122,20 @@ server_main (int argc, PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ACE_TEXT ("test_orb") ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -149,11 +144,9 @@ server_main (int argc, -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return -1; @@ -162,13 +155,11 @@ server_main (int argc, root_poa.in (), use_collocated_call); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); Test::Transport::CurrentTest_var server = Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -178,7 +169,6 @@ server_main (int argc, CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) @@ -226,15 +216,12 @@ server_main (int argc, ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); root_poa->destroy (1, 1 ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server (%P|%t) Invoking orb->destroy ()\n"))); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index 2b945f788c1..b43390afcd9 100644 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ b/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -21,7 +21,6 @@ testCurrentORBInitializer (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("TAO::Transport::Current" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (obj.in () == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 8687263dbc3..cf67ea39361 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -24,14 +24,14 @@ Current_Test_Impl::~Current_Test_Impl (void) } ::CORBA::Long -Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +Current_Test_Impl::self_test (void) ACE_THROW_SPEC ((::CORBA::SystemException)) { return 0; } void -Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::test_transport_current (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { @@ -42,12 +42,10 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var tcobject = this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO::Transport::IIOP::Current_var tc = TAO::Transport::IIOP::Current::_narrow (tcobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (CORBA::is_nil (tc.in())) { @@ -72,7 +70,7 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) void -Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::invoked_by_client (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level >= 1) { @@ -80,27 +78,23 @@ Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) server - Test method invoked by client.\n"))); } - this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; + this->test_transport_current (void); if (this->do_collocated_calls_) { CORBA::Object_var selfobject = poa_->servant_to_reference (this ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; Test::Transport::CurrentTest_var self = Test::Transport::CurrentTest::_narrow (selfobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (TAO_debug_level >= 1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) server - Making a collocated invocation to invoked_during_upcall().\n"))); } self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -115,7 +109,7 @@ Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) } void -Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Current_Test_Impl::invoked_during_upcall (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { @@ -126,7 +120,7 @@ Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Current_Test_Impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index f51936d5d35..086b88916a4 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -26,7 +26,7 @@ namespace Test { } char * - IIOP_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + IIOP_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("II SRI"); @@ -45,12 +45,10 @@ namespace Test { 0, orbid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var tcobject = orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; return TAO::Transport::IIOP::Current::_narrow (tcobject.in () ACE_ENV_ARG_PARAMETER); @@ -184,7 +182,6 @@ namespace Test { { CORBA::String_var name (this->name ()); CORBA::String_var op (ri->operation(ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; if (TAO_debug_level >=1) ACE_DEBUG ((LM_DEBUG, @@ -198,7 +195,6 @@ namespace Test { IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf = reinterpret_cast <const char *> (sc->context_data.get_buffer ()); @@ -230,7 +226,6 @@ namespace Test { IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast <const char *> (sc->context_data.get_buffer ()); @@ -252,7 +247,6 @@ namespace Test { ACE_TRY { inbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -265,7 +259,6 @@ namespace Test { ACE_ENDTRY; Server_Request_Interceptor::receive_request_service_contexts (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -278,7 +271,6 @@ namespace Test { ACE_TRY { outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -292,7 +284,6 @@ namespace Test { ACE_ENDTRY; Server_Request_Interceptor::send_reply (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -305,7 +296,6 @@ namespace Test { ACE_TRY { outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } @@ -321,7 +311,6 @@ namespace Test { ACE_ENDTRY; Server_Request_Interceptor::send_exception (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -333,7 +322,6 @@ namespace Test { ACE_TRY { outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -346,7 +334,6 @@ namespace Test { ACE_ENDTRY; Server_Request_Interceptor::send_other (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 00cd81bdb31..4be2b3c687c 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -55,7 +55,7 @@ namespace Test */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// incomming interception point diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp index 7e94ff502e5..ed4e4bc074e 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp @@ -31,7 +31,6 @@ test_transport_current (CORBA::ORB_ptr orb CORBA::Object_var tcobject = orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (TAO_debug_level >= 1) @@ -41,7 +40,6 @@ test_transport_current (CORBA::ORB_ptr orb Transport::IIOP::Current_var tc = Transport::IIOP::Current::_narrow (tcobject.in () ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; if (TAO_debug_level >= 1) ACE_DEBUG ((LM_DEBUG, @@ -56,33 +54,26 @@ test_transport_current (CORBA::ORB_ptr orb ACE_TRY_THROW (CORBA::INTERNAL ()); } - ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; + ::CORBA::String_var rhost (tc->remote_host ()); - ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; + ::CORBA::String_var lhost (tc->local_host ()); - ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ::CORBA::Long id = tc->id (); - ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ::TAO::CounterT bs = tc->bytes_sent (); - ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ::TAO::CounterT br = tc->bytes_received (); - ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ::TAO::CounterT rs = tc->messages_sent (); - ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ::TAO::CounterT rr = tc->messages_received (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Tester (%P|%t) Transport [%q] [%s:%d -> %s:%d] ") ACE_TEXT ("Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), (ACE_UINT64)id, - rhost.in (), tc->remote_port (ACE_ENV_SINGLE_ARG_PARAMETER), - lhost.in (), tc->local_port (ACE_ENV_SINGLE_ARG_PARAMETER), + rhost.in (), tc->remote_port (), + lhost.in (), tc->local_port (), (ACE_UINT64)bs, (ACE_UINT64)br, (ACE_UINT64)rs, diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index caec63c7038..af40d6d4250 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -126,12 +126,10 @@ Worker::svc (void) CORBA::Request_var request = this->server_->_request ("invoked_by_client" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; request->set_return_type (CORBA::_tc_void); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + request->invoke (); } #endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ @@ -139,8 +137,7 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); - this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->invoked_by_client (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"), @@ -181,14 +178,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, CLIENT_ORB_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -200,7 +195,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client (%P|%t) ERROR: ") @@ -220,11 +214,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Resolve the target object CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Transport::CurrentTest_var server = Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -275,8 +267,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); // Self-test the server side - result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = server->self_test (); if (result != 0) ACE_ERROR ((LM_ERROR, @@ -285,11 +276,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Completed %s\n"), diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index c2ec8913306..72f4bf3076a 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -87,8 +87,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -123,24 +122,20 @@ server_main (int argc, PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ACE_TEXT ("test_orb") ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -149,11 +144,9 @@ server_main (int argc, -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return -1; @@ -162,13 +155,11 @@ server_main (int argc, root_poa.in (), use_collocated_call); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); Test::Transport::CurrentTest_var server = Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -178,7 +169,6 @@ server_main (int argc, CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) @@ -221,11 +211,9 @@ server_main (int argc, ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp index b275e55e0be..83b7b630015 100644 --- a/TAO/tests/Two_Objects/First_i.cpp +++ b/TAO/tests/Two_Objects/First_i.cpp @@ -18,7 +18,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) } void -First_i::oneway_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +First_i::oneway_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n")); diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 6fa70f53749..9c0b161be6a 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -22,7 +22,7 @@ public: First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done); /// Interface methods.. - void oneway_method (ACE_ENV_SINGLE_ARG_DECL) + void oneway_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index 368c3aa94ed..79fc22d1eb4 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -18,7 +18,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len) //factory method to create first object Two_Objects_Test::First_ptr -Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL) +Object_Factory_i::create_first (void) ACE_THROW_SPEC ((CORBA::SystemException)) { First_i *first_impl; @@ -36,7 +36,7 @@ Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL) //factory method to create second object Two_Objects_Test::Second_ptr -Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL) +Object_Factory_i::create_second (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Second_i *second_impl; @@ -47,8 +47,7 @@ Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); Two_Objects_Test::Second_var second = - second_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (Two_Objects_Test::Second::_nil ()); + second_impl->_this (); return second._retn(); } diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index fbfd2ef094c..f9d09a6c974 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -21,10 +21,10 @@ public: Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len); - Two_Objects_Test::First_ptr create_first (ACE_ENV_SINGLE_ARG_DECL) + Two_Objects_Test::First_ptr create_first (void) ACE_THROW_SPEC ((CORBA::SystemException)); - Two_Objects_Test::Second_ptr create_second (ACE_ENV_SINGLE_ARG_DECL) + Two_Objects_Test::Second_ptr create_second (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index cf3c9f5abff..63d61f9b4ce 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -23,7 +23,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb, } Two_Objects_Test::Octet_Seq * -Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL) +Second_i::twoway_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Two_Objects_Test::Octet_Seq *preply_mesg; @@ -55,7 +55,7 @@ Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL) } void -Second_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Second_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index aa0375c9b2f..be08514e3e9 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -21,10 +21,10 @@ public: CORBA::ULong len, ACE_Auto_Event &two_way_done); Two_Objects_Test::Octet_Seq * - twoway_method (ACE_ENV_SINGLE_ARG_DECL) + twoway_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp index d93a387409a..aedd4b27658 100644 --- a/TAO/tests/Two_Objects/client.cpp +++ b/TAO/tests/Two_Objects/client.cpp @@ -44,7 +44,6 @@ main (int argc, char *argv[]) // Initialize the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse the arguments if (parse_args (argc, argv) != 0) @@ -55,13 +54,11 @@ main (int argc, char *argv[]) // object. CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the object reference to the appropriate type Two_Objects_Test::Object_Factory_var factory = Two_Objects_Test::Object_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) { @@ -79,20 +76,17 @@ main (int argc, char *argv[]) second = factory->create_second(); // Call the oneway method - first->oneway_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + first->oneway_method (); ACE_DEBUG ((LM_DEBUG, "Client : one way call done\n")); Two_Objects_Test::Octet_Seq_var reply_seq = - second->twoway_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + second->twoway_method (); ACE_DEBUG ((LM_DEBUG, "Client : length of returned data is %d\n", reply_seq->length() )); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 0e6d5a8e9f2..07d09da9a72 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -62,17 +62,14 @@ main (int argc, char *argv[]) // Initialize the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get initial reference to the Root POA CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow down to the appropriate type PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -81,8 +78,7 @@ main (int argc, char *argv[]) // Get referencee to the POA manager PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Parse the arguments if (parse_args (argc, argv) != 0) @@ -101,14 +97,12 @@ main (int argc, char *argv[]) // _this method registers the object withe the POA and returns // an object reference Two_Objects_Test::Object_Factory_var factory = - factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + factory_impl->_this (); // Convert the object reference to a string so that it can // be saved in a file and used by clinet programs later CORBA::String_var ior = orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -123,8 +117,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Activate the POA manager - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Instantiate the specified # of worker threads Worker worker (orb.in (), orb_timeout); @@ -141,10 +134,8 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index ae0889a419a..6c6ad4951fc 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -21,7 +21,6 @@ Worker::svc (void) // orb times out after <timeout> seconds this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp index 4637dc4b943..fc4e714d1af 100644 --- a/TAO/tests/Typedef_String_Array/client.cpp +++ b/TAO/tests/Typedef_String_Array/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; SimpleStrings_var server = SimpleStrings::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -63,15 +60,13 @@ main (int argc, char *argv[]) ArrayOfString_var the_strings; server->get_strings (the_strings.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for(size_t i = 0; i < 15; i++) { ACE_DEBUG ((LM_DEBUG, "%s\n", the_strings[i].in ())); } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 51f5f7792af..7564cf6e0ce 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -40,11 +40,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,23 +51,19 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; TestImpl test_impl (orb.in ()); - SimpleStrings_var server = test_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + SimpleStrings_var server = test_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,19 +80,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 2beb08f85fa..30833dba14c 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -32,8 +32,8 @@ public: void unknown_exception_during_deactivation (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void _add_ref (void); + void _remove_ref (void); CORBA::ORB_var orb_; @@ -84,7 +84,7 @@ test_i::unknown_exception_during_deactivation (void) } void -test_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL) +test_i::_add_ref (void) { ACE_DEBUG ((LM_DEBUG, "test_i::_add_ref() called; current refcount = %d\n", @@ -92,7 +92,7 @@ test_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL) +test_i::_remove_ref (void) { ACE_DEBUG ((LM_DEBUG, "test_i::_remove_ref() called; current refcount = %d\n", diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index 713ddb68f84..c43297888e8 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -33,12 +33,10 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client client (orb.in ()); client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; client.add_callback (control); @@ -92,11 +90,9 @@ Client::parse_args (int argc, CORBA::Object_var object = this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->server_ = Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(this->server_.in ())) { @@ -147,8 +143,7 @@ Client::start_hook (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->server_->start (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->start (); } ACE_CATCHANY { @@ -156,7 +151,6 @@ Client::start_hook (void) return; } ACE_ENDTRY; - ACE_CHECK; } void @@ -165,8 +159,7 @@ Client::stop_hook (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->server_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->stop (); } ACE_CATCHANY { @@ -175,6 +168,5 @@ Client::stop_hook (void) return; } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index 374dcb368f0..deb87bb021f 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -69,11 +69,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,11 +80,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); stopwatch.manage (); @@ -96,12 +92,10 @@ main (int argc, char *argv[]) Stopwatch_imp server_impl (orb.in (), &timer); Stopwatch_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -118,8 +112,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); XtRealizeWidget (toplevel); /* Looks like there seems to be a problem with ST cases using diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index de99f651892..60e7c2775e1 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -11,21 +11,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) } void -Stopwatch_imp::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::start (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->start (); } void -Stopwatch_imp::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::stop (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->stop (); } void -Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h index 33e4e0e826f..ba92631590d 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.h +++ b/TAO/tests/Xt_Stopwatch/test_i.h @@ -33,13 +33,13 @@ public: // ctor // = The Simple_Server methods. - void start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void start (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void stop (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: |