diff options
Diffstat (limited to 'TAO/tests')
1095 files changed, 8779 insertions, 14241 deletions
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 34ffc46f424..71aea07de15 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -8,16 +8,16 @@ int main (int argc, char *argv[]) { int received_expected_exception = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Roundtrip::_narrow (object.in ()); if (CORBA::is_nil (roundtrip.in ())) { @@ -27,25 +27,23 @@ main (int argc, char *argv[]) 1); } - ACE_TRY { + try{ Test::Timestamp time = 10; - roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); + roundtrip->test_method (time); } - ACE_CATCH(Test::ServerOverload, ov) + catch (const Test::ServerOverload& ) { ACE_DEBUG ((LM_DEBUG, "Received expected exception\n")); received_expected_exception = 1; roundtrip->shutdown (); } - ACE_ENDTRY; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); return 1; } - ACE_ENDTRY; if(!received_expected_exception) { diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 0a124577673..e22de7cddf3 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -15,11 +15,10 @@ public: ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL) + void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -37,8 +36,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)) { // Throw an overload exception @@ -48,22 +46,21 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, // Calee owns the memory now. Need not delete 'ts' Test::AMH_RoundtripExceptionHolder holder (ts); - ACE_TRY + try { - _tao_rh->test_method_excep (&holder ACE_ENV_ARG_PARAMETER); + _tao_rh->test_method_excep (&holder); } - ACE_CATCHALL + catch (...) {} - ACE_ENDTRY; ACE_UNUSED_ARG (send_time); } void -ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL) +ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } /*** Server Declaration ***/ @@ -116,51 +113,48 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv) ST_AMH_Server::~ST_AMH_Server () { - ACE_TRY_NEW_ENV + try { - this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1); this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } int ST_AMH_Server::start_orb_and_poa (void) { - ACE_TRY_NEW_ENV + try { this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, - "" ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); - this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); poa_manager->activate (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -168,28 +162,26 @@ ST_AMH_Server::start_orb_and_poa (void) void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { - ACE_TRY_NEW_ENV + try { Test::Roundtrip_var roundtrip = servant->_this (); CORBA::String_var ior = - this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (roundtrip.in ()); (void) this->write_ior_to_file (ior); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } void ST_AMH_Server::run_event_loop () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value period (0, 11000); while (!this->orb_->orb_core ()->has_shutdown ()) @@ -197,9 +189,8 @@ ST_AMH_Server::run_event_loop () this->orb_->perform_work (&period); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) {} - ACE_ENDTRY; } int diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp index 2e88cf01777..b0995e4103a 100644 --- a/TAO/tests/AMH_Oneway/client.cpp +++ b/TAO/tests/AMH_Oneway/client.cpp @@ -27,19 +27,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Roundtrip::_narrow (object.in ()); if (CORBA::is_nil (roundtrip.in ())) { @@ -55,18 +55,17 @@ main (int argc, char *argv[]) Test::Timestamp time = 10; for (int i = 0; i < num_calls; i++) { - roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); + roundtrip->test_method (time); ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i)); } orb->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 75b4004ae8e..cf0bd27d376 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -41,8 +41,7 @@ public: ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -60,8 +59,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_OS::sleep (1); @@ -140,51 +138,48 @@ ST_AMH_Server::~ST_AMH_Server () void ST_AMH_Server::cleanup () { - ACE_TRY_NEW_ENV + try { - this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1); this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } int ST_AMH_Server::start_orb_and_poa (void) { - ACE_TRY_NEW_ENV + try { this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, - "" ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); - this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); poa_manager->activate (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -192,28 +187,26 @@ ST_AMH_Server::start_orb_and_poa (void) void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { - ACE_TRY_NEW_ENV + try { Test::Roundtrip_var roundtrip = servant->_this (); CORBA::String_var ior = - this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (roundtrip.in ()); (void) this->write_ior_to_file (ior); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } void ST_AMH_Server::run_event_loop () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value period (0, 11000); while (1) @@ -225,9 +218,8 @@ ST_AMH_Server::run_event_loop () return; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) {} - ACE_ENDTRY; } int diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index 2366e264897..cc30da0f035 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -29,8 +29,7 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) CORBA::Long AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, - const char* in_str - ACE_ENV_ARG_DECL) + const char* in_str) ACE_THROW_SPEC ((CORBA::SystemException, A::DidTheRightThing)) { @@ -73,8 +72,7 @@ AMI_Test_i::yadda (void) void -AMI_Test_i::yadda (CORBA::Long yadda - ACE_ENV_ARG_DECL_NOT_USED) +AMI_Test_i::yadda (CORBA::Long yadda) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -83,8 +81,7 @@ AMI_Test_i::yadda (CORBA::Long yadda } void -AMI_Test_i::inout_arg_test (char *& - ACE_ENV_ARG_DECL_NOT_USED) +AMI_Test_i::inout_arg_test (char *&) ACE_THROW_SPEC ((CORBA::SystemException)) { // No action, this operation is to test code generation for INOUT diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index 9db507d5835..12070d3c5cd 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -31,8 +31,7 @@ public: // The AMI_Test methods. CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, - const char* in_str - ACE_ENV_ARG_DECL) + const char* in_str) ACE_THROW_SPEC ((CORBA::SystemException, A::DidTheRightThing)); @@ -42,12 +41,10 @@ public: CORBA::Long yadda (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void yadda (CORBA::Long yadda - ACE_ENV_ARG_DECL) + void yadda (CORBA::Long yadda) ACE_THROW_SPEC ((CORBA::SystemException)); - void inout_arg_test (char *& str - ACE_ENV_ARG_DECL) + void inout_arg_test (char *& str) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 4115fa32919..c43a3ade875 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -98,8 +98,7 @@ public: Handler (void) {}; void foo (CORBA::Long result, - CORBA::Long out_l - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long out_l) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -113,27 +112,23 @@ public: --number_of_replies; }; - void foo_excep (::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + void foo_excep (::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called: \n")); - ACE_TRY + try { excep_holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; }; - void get_yadda (CORBA::Long result - ACE_ENV_ARG_DECL_NOT_USED) + void get_yadda (CORBA::Long result) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -141,8 +136,7 @@ public: result)); }; - void get_yadda_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void get_yadda_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -156,8 +150,7 @@ public: "Callback method <set_yadda> called: \n")); }; - void set_yadda_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void set_yadda_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -167,7 +160,6 @@ public: void inout_arg_test ( const char * - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -175,8 +167,7 @@ public: "Callback method <set_yadda_excep> called: \n")); } - void inout_arg_test_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void inout_arg_test_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -188,20 +179,19 @@ Handler handler; int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); A::AMI_Test_var server = - A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + A::AMI_Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -214,7 +204,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -222,7 +212,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -278,17 +268,15 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -300,13 +288,13 @@ Client::Client (A::AMI_Test_ptr server, : ami_test_var_ (A::AMI_Test::_duplicate (server)), niterations_ (niterations) { - the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */); + the_handler_var_ = handler._this (/* */); } int Client::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Long number = 931232; @@ -314,8 +302,7 @@ Client::svc (void) { ami_test_var_->sendc_foo (the_handler_var_.in (), number, - "Let's talk AMI." - ACE_ENV_ARG_PARAMETER); + "Let's talk AMI."); } if (debug) { @@ -324,11 +311,9 @@ Client::svc (void) niterations)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client: exception raised"); + ex._tao_print_exception ("MT_Client: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index 5b4b5a0523c..f829e76a50f 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -54,14 +54,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +68,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -83,7 +82,7 @@ main (int argc, char *argv[]) ami_test_i._this (); CORBA::String_var ior = - orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (ami_test_var.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,19 +105,17 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index fc9c9b722df..2cde2862715 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -74,8 +74,7 @@ public: ~Handler (void) {}; void foo (CORBA::Long ami_return_val, - CORBA::Long out_l - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long out_l) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -87,35 +86,32 @@ public: } }; - void foo_excep (::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + void foo_excep (::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called: \n" "Testing proper exception handling ...\n")); - ACE_TRY + try { excep_holder->raise_exception (); } - ACE_CATCH (A::DidTheRightThing, ex) + catch (const A::DidTheRightThing& ) { ACE_DEBUG ((LM_DEBUG, "... exception received successfully\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR"); + ex._tao_print_exception ("ERROR"); ACE_ERROR ((LM_ERROR, "... caught the wrong exception -> ERROR\n")); } - ACE_ENDTRY; }; - void get_yadda (CORBA::Long result - ACE_ENV_ARG_DECL_NOT_USED) + void get_yadda (CORBA::Long result) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -123,8 +119,7 @@ public: result)); }; - void get_yadda_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void get_yadda_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -138,8 +133,7 @@ public: "Callback method <set_yadda> called: \n")); }; - void set_yadda_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void set_yadda_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -148,7 +142,6 @@ public: void inout_arg_test ( const char * - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -156,8 +149,7 @@ public: "Callback method <set_yadda_excep> called: \n")); } - void inout_arg_test_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) + void inout_arg_test_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -167,18 +159,17 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object_var = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa_var = - PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object_var.in ()); PortableServer::POAManager_var poa_manager_var = poa_var->the_POAManager (); @@ -189,10 +180,10 @@ main (int argc, char *argv[]) return 1; // We reuse the object_var smart pointer! - object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + object_var = orb->string_to_object (ior); A::AMI_Test_var ami_test_var = - A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); + A::AMI_Test::_narrow (object_var.in ()); if (CORBA::is_nil (ami_test_var.in ())) { @@ -212,8 +203,7 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (), 0, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Trigger the DidTheRightThing exception on the server side // by sending 0 to it. @@ -222,8 +212,7 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), 0, - "Let's talk AMI." - ACE_ENV_ARG_PARAMETER); + "Let's talk AMI."); CORBA::Long l = 931247; @@ -235,20 +224,16 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), l, - "Let's talk AMI." - ACE_ENV_ARG_PARAMETER); + "Let's talk AMI."); } // Begin test of attributes - ami_test_var->sendc_get_yadda (the_handler_var.in () - ACE_ENV_ARG_PARAMETER); + ami_test_var->sendc_get_yadda (the_handler_var.in ()); ami_test_var->sendc_set_yadda (the_handler_var.in (), - 4711 - ACE_ENV_ARG_PARAMETER); + 4711); - ami_test_var->sendc_get_yadda (the_handler_var.in () - ACE_ENV_ARG_PARAMETER); + ami_test_var->sendc_get_yadda (the_handler_var.in ()); // End test of attributes @@ -271,8 +256,7 @@ main (int argc, char *argv[]) CORBA::Long number = ami_test_var->foo (l, l, - "Let's talk SMI." - ACE_ENV_ARG_PARAMETER); + "Let's talk SMI."); if (debug) { @@ -288,17 +272,15 @@ main (int argc, char *argv[]) poa_var->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index 06c2646234a..7f4cfd6be39 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -29,20 +29,18 @@ AMI_Buffering::Nest_Guard::~Nest_Guard (void) } void -AMI_Buffering::receive_data (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) +AMI_Buffering::receive_data (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { AMI_Buffering::Nest_Guard ng(*this); - this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER); + this->admin_->request_received (the_payload.length ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG,"(%P|%t) DEBUG: AMI_Buffering::receive_data")); } - ACE_ENDTRY; this->try_shutdown(); } @@ -75,7 +73,7 @@ AMI_Buffering::try_shutdown(void) 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); + this->admin_->shutdown(); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index 9da7fce9aab..e5df2680bee 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -18,8 +18,7 @@ public: Test::AMI_Buffering_Admin_ptr admin); // = The skeleton methods - virtual void receive_data (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) + virtual void receive_data (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void flush (void) diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index 10f02433a07..cf00721a861 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -27,8 +27,7 @@ AMI_Buffering_Admin::bytes_received_count (void) } void -AMI_Buffering_Admin::request_received (CORBA::ULong payload_length - ACE_ENV_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::request_received (CORBA::ULong payload_length) ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; @@ -45,5 +44,5 @@ void AMI_Buffering_Admin::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index 1f75cf5f205..6deca90143b 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -23,8 +23,7 @@ public: virtual CORBA::ULong bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void request_received (CORBA::ULong payload_length - ACE_ENV_ARG_DECL) + virtual void request_received (CORBA::ULong payload_length) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void flush (void) diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp index cbf41c79279..d1ac09cdabf 100644 --- a/TAO/tests/AMI_Buffering/Client_Task.cpp +++ b/TAO/tests/AMI_Buffering/Client_Task.cpp @@ -23,25 +23,23 @@ int Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { while (1) { // run the even loop for 1 second... ACE_Time_Value tv (1, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); if (this->terminate_loop_ != 0) break; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp index e8596bf670d..ef5d94d28be 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -16,20 +16,17 @@ Reply_Handler::receive_data (void) } void -Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) +Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "receive_data: "); + ex._tao_print_exception ("receive_data: "); } - ACE_ENDTRY; } void @@ -39,20 +36,17 @@ Reply_Handler::sync (void) } void -Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) +Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "sync: "); + ex._tao_print_exception ("sync: "); } - ACE_ENDTRY; } void @@ -62,18 +56,15 @@ Reply_Handler::shutdown (void) } void -Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) +Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "shutdown: "); + ex._tao_print_exception ("shutdown: "); } - ACE_ENDTRY; } diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index be6cb13121e..34638d1a812 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -19,20 +19,17 @@ public: // = The skeleton methods virtual void receive_data (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_data_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) + virtual void receive_data_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sync (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) + virtual void sync_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) + virtual void shutdown_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index 673c71c43eb..2bd2e711252 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) AMI_buffering_admin_impl->_this (); CORBA::String_var ior = - orb->object_to_string (AMI_buffering_admin.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (AMI_buffering_admin.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,17 +87,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in admin:"); + ex._tao_print_exception ("Exception caught in admin:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 83ee301c399..cbe44b66b1f 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -93,40 +93,36 @@ parse_args (int argc, char *argv[]) int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr oneway_buffering, - Test::AMI_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr oneway_buffering_admin); int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int main (int argc, char *argv[]) { int test_failed = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -142,10 +138,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); Test::AMI_Buffering_var ami_buffering = - Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow(tmp.in ()); if (CORBA::is_nil (ami_buffering.in ())) { @@ -156,10 +152,10 @@ main (int argc, char *argv[]) } tmp = - orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(admin_ior); Test::AMI_Buffering_Admin_var ami_buffering_admin = - Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering_Admin::_narrow(tmp.in ()); if (CORBA::is_nil (ami_buffering_admin.in ())) { @@ -182,8 +178,7 @@ main (int argc, char *argv[]) test_failed = run_message_count (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_timeout_test) { @@ -192,8 +187,7 @@ main (int argc, char *argv[]) test_failed = run_timeout (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_timeout_reactive_test) { @@ -202,8 +196,7 @@ main (int argc, char *argv[]) test_failed = run_timeout_reactive (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_buffer_size_test) { @@ -212,8 +205,7 @@ main (int argc, char *argv[]) test_failed = run_buffer_size (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else { @@ -227,17 +219,15 @@ main (int argc, char *argv[]) ami_buffering->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return test_failed; } @@ -246,14 +236,13 @@ int configure_policies (CORBA::ORB_ptr orb, const TAO::BufferingConstraint &buffering_constraint, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_out flusher - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_out flusher) { CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -269,15 +258,12 @@ configure_policies (CORBA::ORB_ptr orb, CORBA::PolicyList policies (2); policies.length (2); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); policies[1]->destroy (); @@ -292,26 +278,23 @@ configure_policies (CORBA::ORB_ptr orb, policies.length (1); policies[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); object = ami_buffering->_set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); flusher = - Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow (object.in ()); return 0; } void sync_server (CORBA::ORB_ptr orb, - Test::AMI_Buffering_ptr flusher - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_ptr flusher) { // Get back in sync with the server... flusher->flush (); @@ -319,7 +302,7 @@ sync_server (CORBA::ORB_ptr orb, // Drain responses from the queue ACE_Time_Value tv (0, 100000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } int @@ -327,14 +310,13 @@ run_liveness_test (CORBA::ORB_ptr orb, Test::AMI_AMI_BufferingHandler_ptr reply_handler, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_ptr flusher, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; // Get back in sync with the server... - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); CORBA::ULong send_count = ami_buffering_admin->request_count (); @@ -352,15 +334,14 @@ run_liveness_test (CORBA::ORB_ptr orb, for (int i = 0; i != liveness_test_iterations; ++i) { ami_buffering->sendc_receive_data (reply_handler, - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Once the system has sent enough messages we don't // expect it to fall too far behind, i.e. at least 90% of the @@ -377,12 +358,12 @@ run_liveness_test (CORBA::ORB_ptr orb, "expected %u\n", i, receive_count, expected)); - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); } if (depth++ == LIVENESS_MAX_DEPTH) { - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); depth = 0; } @@ -394,8 +375,7 @@ run_liveness_test (CORBA::ORB_ptr orb, int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; @@ -406,8 +386,7 @@ run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -429,7 +408,7 @@ run_message_count (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -445,15 +424,14 @@ run_message_count (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong iteration_count = send_count - initial_receive_count; @@ -491,8 +469,7 @@ run_message_count (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -503,8 +480,7 @@ run_message_count (CORBA::ORB_ptr orb, int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -515,8 +491,7 @@ run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -538,7 +513,7 @@ run_timeout (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -555,15 +530,14 @@ run_timeout (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -601,8 +575,7 @@ run_timeout (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -613,8 +586,7 @@ run_timeout (CORBA::ORB_ptr orb, int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -625,8 +597,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -648,7 +619,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -664,8 +635,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, for (int j = 0; j != 20; ++j) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; } while (1) @@ -674,7 +644,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -713,8 +683,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -727,8 +696,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; @@ -739,8 +707,7 @@ run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -760,7 +727,7 @@ run_buffer_size (CORBA::ORB_ptr orb, CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_bytes_received = ami_buffering_admin->bytes_received_count (); @@ -776,15 +743,14 @@ run_buffer_size (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = ami_buffering_admin->bytes_received_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong payload_delta = bytes_sent - initial_bytes_received; @@ -827,8 +793,7 @@ run_buffer_size (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index 5eb416c79dd..53e85d2e7ca 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -43,16 +43,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,10 +66,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::AMI_Buffering_Admin_var admin = - Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering_Admin::_narrow(tmp.in ()); if (CORBA::is_nil (admin.in ())) { @@ -90,7 +90,7 @@ main (int argc, char *argv[]) AMI_buffering_impl->_this (); CORBA::String_var ior = - orb->object_to_string (AMI_buffering.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (AMI_buffering.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -108,17 +108,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server:"); + ex._tao_print_exception ("Exception caught in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 50f0a8bb316..d5b81fcd707 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -62,20 +62,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); TimeoutObj_var timeout_var = - TimeoutObj::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + TimeoutObj::_narrow (object.in ()); if (CORBA::is_nil (timeout_var.in ())) { @@ -88,7 +87,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -96,7 +95,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -123,7 +122,7 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); // Wait for all the threads to finish before destroying the // ORB. @@ -134,13 +133,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index 0133cabfb53..56245f32862 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -54,14 +54,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +68,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -83,7 +82,7 @@ main (int argc, char *argv[]) timeout_i._this (); CORBA::String_var ior = - orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (timeout_var.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -125,19 +124,17 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); //delete client; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 5915ee346e6..864ac112f9f 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -47,8 +47,7 @@ TimeoutClient::svc () { this->initialize (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Tests timeouts for synchronous @@ -70,14 +69,13 @@ TimeoutClient::svc () ACE_OS::sleep (tv); // shut down local ORB - orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "TimeoutClient::svc: Done\n\n")); @@ -88,22 +86,19 @@ TimeoutClient::svc () int TimeoutClient::initialize () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::Object_var object = - orb_->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("ORBPolicyManager"); policy_manager_ = - CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -130,8 +125,7 @@ TimeoutClient::send (CORBA::Boolean async, CORBA::PolicyList policy_list (1); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY_EX (normal) + try { if (local_timeout != 0) { @@ -143,22 +137,16 @@ TimeoutClient::send (CORBA::Boolean async, policy_list.length (1); policy_list[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_orb - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (normal); + any_orb); policy_manager_->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (normal); + CORBA::SET_OVERRIDE); } else { policy_list.length (0); policy_manager_->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (normal); + CORBA::SET_OVERRIDE); } @@ -168,18 +156,14 @@ TimeoutClient::send (CORBA::Boolean async, if (async) { timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (), - remote_sleep - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (normal); + remote_sleep); } else // synch { - timeoutObject_->sendTimeToWait (remote_sleep - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (normal); + timeoutObject_->sendTimeToWait (remote_sleep); } } - ACE_CATCH (CORBA::TIMEOUT, timeout) + catch (const CORBA::TIMEOUT& ) { local_reply_excep_counter_++; @@ -188,23 +172,20 @@ TimeoutClient::send (CORBA::Boolean async, " timeout ")); } - ACE_ENDTRY; // get rid of the policy, you created before. - ACE_TRY_EX (cleanup) + try { if (local_timeout != 0) { policy_list[0]->destroy (); - ACE_TRY_CHECK_EX (cleanup); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "Error: Unexpected exception\n\n")); } - ACE_ENDTRY; // 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 aea3b3444f6..85e35ccbf46 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp @@ -29,8 +29,7 @@ Timeout_i::~Timeout_i () } void -Timeout_i::sendTimeToWait (CORBA::Long msec - ACE_ENV_ARG_DECL_NOT_USED) +Timeout_i::sendTimeToWait (CORBA::Long msec) ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, @@ -82,28 +81,26 @@ TimeoutHandler_i::sendTimeToWait (void) } void -TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder - ACE_ENV_ARG_DECL) +TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { timer_.stop (); - ACE_TRY + try { excep_holder->raise_exception (); } - ACE_CATCH (CORBA::TIMEOUT, timeout) + catch (const CORBA::TIMEOUT& ) { ACE_DEBUG ((LM_DEBUG, "timeout")); reply_excep_counter_++; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "Error: Unexpected exception")); } - ACE_ENDTRY; } void diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h index ed102627fe9..d82a6c73eee 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.h +++ b/TAO/tests/AMI_Timeouts/timeout_i.h @@ -31,8 +31,7 @@ public: ~Timeout_i (); - virtual void sendTimeToWait (CORBA::Long msec - ACE_ENV_ARG_DECL) + virtual void sendTimeToWait (CORBA::Long msec) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) @@ -55,8 +54,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sendTimeToWait_excep ( - ::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + ::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)); void reset_reply_counter (); diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp index 8b06b2ef622..0fcf7680569 100644 --- a/TAO/tests/Abstract_Interface/client.cpp +++ b/TAO/tests/Abstract_Interface/client.cpp @@ -124,11 +124,9 @@ test_state (base_ptr abs) } void -test_operation (base_ptr abs - ACE_ENV_ARG_DECL) +test_operation (base_ptr abs) { - CORBA::String_var retval = abs->base_op ("base_op" - ACE_ENV_ARG_PARAMETER); + CORBA::String_var retval = abs->base_op ("base_op"); if (debug) { @@ -139,11 +137,9 @@ test_operation (base_ptr abs CORBA::Object_var obj = abs->_to_object (); - foo_var concrete = foo::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + foo_var concrete = foo::_narrow (obj.in ()); - retval = concrete->foo_op ("foo_op" - ACE_ENV_ARG_PARAMETER); + retval = concrete->foo_op ("foo_op"); if (debug) { @@ -152,8 +148,7 @@ test_operation (base_ptr abs retval.in ())); } - retval = concrete->base_op ("base_op" - ACE_ENV_ARG_PARAMETER); + retval = concrete->base_op ("base_op"); if (debug) { @@ -164,11 +159,9 @@ test_operation (base_ptr abs } void -test_exception (base_ptr abs - ACE_ENV_ARG_DECL) +test_exception (base_ptr abs) { - CORBA::String_var retval = abs->base_op ("bad_name" - ACE_ENV_ARG_PARAMETER); + CORBA::String_var retval = abs->base_op ("bad_name"); if (debug) { @@ -183,12 +176,11 @@ main (int argc, char *argv[]) { CORBA::String_var retval; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -196,8 +188,7 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior_input_file - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior_input_file); if (CORBA::is_nil (obj.in ())) { @@ -206,8 +197,7 @@ main (int argc, char *argv[]) -1); } - passer_var objref = passer::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + passer_var objref = passer::_narrow (obj.in ()); if (CORBA::is_nil (objref.in ())) { @@ -227,8 +217,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -238,8 +227,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -249,12 +237,10 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); sn_factory->_remove_ref (); // release ownership - objref->pass_state (package.out () - ACE_ENV_ARG_PARAMETER); + objref->pass_state (package.out ()); if (CORBA::is_nil (package.in ())) { @@ -268,8 +254,7 @@ main (int argc, char *argv[]) if (which_test != TEST_STATE) { - objref->pass_ops (package.out () - ACE_ENV_ARG_PARAMETER); + objref->pass_ops (package.out ()); if (CORBA::is_nil (package.in ())) { @@ -281,25 +266,22 @@ main (int argc, char *argv[]) if (which_test == TEST_OPERATION || which_test == TEST_ALL) { - test_operation (package.in () - ACE_ENV_ARG_PARAMETER); + test_operation (package.in ()); } if (which_test == TEST_EXCEPTION || which_test == TEST_ALL) { which_test = TEST_EXCEPTION; - test_exception (package.in () - ACE_ENV_ARG_PARAMETER); + test_exception (package.in ()); } orb->destroy (); } - ACE_CATCH (BadInput, ex) + catch (const BadInput& ex) { if (which_test != TEST_EXCEPTION) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 1; } @@ -311,14 +293,12 @@ main (int argc, char *argv[]) ex.message.in ())); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index eb99476bc0c..d9dca0ceb04 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -39,12 +39,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Create and register factory for BaseNode. BaseNode_init *bn_factory = 0; @@ -53,8 +52,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -64,8 +62,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -75,13 +72,11 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); sn_factory->_remove_ref (); // release ownership CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -91,8 +86,7 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -107,8 +101,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", @@ -136,23 +129,19 @@ main (int argc, char *argv[]) poa_manager->activate (); ACE_Time_Value tv (10); - orb->run (tv - ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Destroy the POA, waiting until the destruction terminates root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception caught - "); + ex._tao_print_exception ("Server: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index 964af0f9dcd..b7dbaa3b445 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -10,8 +10,7 @@ ACE_RCSID (Abstract_Interface, char * -foo_i::foo_op (const char * inarg - ACE_ENV_ARG_DECL) +foo_i::foo_op (const char * inarg) ACE_THROW_SPEC (( CORBA::SystemException, BadInput @@ -33,8 +32,7 @@ foo_i::foo_op (const char * inarg } char * -foo_i::base_op (const char * inarg - ACE_ENV_ARG_DECL) +foo_i::base_op (const char * inarg) ACE_THROW_SPEC (( CORBA::SystemException, BadInput @@ -56,8 +54,7 @@ foo_i::base_op (const char * inarg } void -passer_i::pass_ops (base_out outarg - ACE_ENV_ARG_DECL) +passer_i::pass_ops (base_out outarg) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -70,8 +67,7 @@ passer_i::pass_ops (base_out outarg } void -passer_i::pass_state (base_out outarg - ACE_ENV_ARG_DECL_NOT_USED) +passer_i::pass_state (base_out outarg) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h index b9af23803aa..f389142c342 100644 --- a/TAO/tests/Abstract_Interface/test_i.h +++ b/TAO/tests/Abstract_Interface/test_i.h @@ -7,15 +7,13 @@ class foo_i : public virtual POA_foo { - virtual char * foo_op (const char * inarg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual char * foo_op (const char * inarg) ACE_THROW_SPEC (( CORBA::SystemException, BadInput )); - virtual char * base_op (const char * inarg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual char * base_op (const char * inarg) ACE_THROW_SPEC (( CORBA::SystemException, BadInput @@ -24,14 +22,12 @@ class foo_i : public virtual POA_foo class passer_i : public virtual POA_passer { - virtual void pass_ops (base_out outarg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pass_ops (base_out outarg) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void pass_state (base_out outarg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pass_state (base_out outarg) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp index 1f0ca96671d..a9e1e860ca3 100644 --- a/TAO/tests/Any/Recursive/client.cpp +++ b/TAO/tests/Any/Recursive/client.cpp @@ -111,20 +111,18 @@ dump<Test::RecursiveUnion> (Test::RecursiveUnion * data) template<typename T> void perform_invocation (Test::Hello_ptr hello, - CORBA::Any const & the_any - ACE_ENV_ARG_DECL) + CORBA::Any const & the_any) { // Execute more than once to help verify that mutable recursive // TypeCode state is managed correctly. for (unsigned int n = 0; n < 2; ++n) { CORBA::Any_var my_any = - hello->get_any (the_any - ACE_ENV_ARG_PARAMETER); + hello->get_any (the_any); T * my_foo = 0; if (!(my_any.in () >>= my_foo)) - ACE_THROW (Test::Demarshaling_From_Any_Failed ()); + throw Test::Demarshaling_From_Any_Failed (); // ACE_DEBUG ((LM_DEBUG, "Data dump:\n")); // dump<T> (my_foo); @@ -133,25 +131,22 @@ perform_invocation (Test::Hello_ptr hello, CORBA::TypeCode_var my_tc = my_any->type (); CORBA::Boolean const equal_tc = - the_tc->equal (my_tc.in () - ACE_ENV_ARG_PARAMETER); + the_tc->equal (my_tc.in ()); if (!equal_tc) - ACE_THROW (Test::Recursive_Type_In_Any_Test_Failed ()); + throw Test::Recursive_Type_In_Any_Test_Failed (); CORBA::Boolean const equiv_tc = - the_tc->equivalent (my_tc.in () - ACE_ENV_ARG_PARAMETER); + the_tc->equivalent (my_tc.in ()); if (!equiv_tc) - ACE_THROW (Test::Recursive_Type_In_Any_Test_Failed ()); + throw Test::Recursive_Type_In_Any_Test_Failed (); } } void recursive_struct_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr hello - ACE_ENV_ARG_DECL) + Test::Hello_ptr hello) { ACE_DEBUG ((LM_INFO, "Executing recursive struct test\n")); @@ -167,14 +162,12 @@ recursive_struct_test (CORBA::ORB_ptr /* orb */, the_any <<= foo; ::perform_invocation<Test::RecursiveStruct> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); } void nested_recursive_struct_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr hello - ACE_ENV_ARG_DECL) + Test::Hello_ptr hello) { ACE_DEBUG ((LM_INFO, "Executing nested recursive struct test\n")); @@ -190,14 +183,12 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */, the_any <<= foo; ::perform_invocation<Test::NestedRecursiveStruct> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); } void recursive_union_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr hello - ACE_ENV_ARG_DECL) + Test::Hello_ptr hello) { ACE_DEBUG ((LM_INFO, "Executing recursive union test\n")); @@ -212,8 +203,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= foo_enum; ::perform_invocation<Test::EnumUnion> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); // Non-recursive member case. foo.i (test_long); @@ -221,8 +211,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= foo; ::perform_invocation<Test::RecursiveUnion> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); // Recursive member case. Test::RecursiveUnionSeq seq; @@ -235,8 +224,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= foo; ::perform_invocation<Test::RecursiveUnion> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); // Recursive member case with no default member Test::RecursiveUnionSeqNoDefault seqnodefault; @@ -250,8 +238,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= foonodefault; ::perform_invocation<Test::RecursiveUnionNoDefault> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); // Recursive member case with enum . Test::VSortRecursiveUnionSeq vsortseq; @@ -265,23 +252,20 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= vsort_foo; ::perform_invocation<Test::VSortRecursiveUnion> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); // Non-recursive member case with enum . Test::NonRecursiveUnionWithEnum val; the_any <<= val; ::perform_invocation<Test::NonRecursiveUnionWithEnum> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); } void indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr /* hello */ - ACE_ENV_ARG_DECL_NOT_USED) + Test::Hello_ptr /* hello */) { ACE_DEBUG ((LM_INFO, "Executing indirectly recursive valuetype test\n")); @@ -292,8 +276,7 @@ indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */, void directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr /* hello */ - ACE_ENV_ARG_DECL_NOT_USED) + Test::Hello_ptr /* hello */) { ACE_DEBUG ((LM_INFO, "Executing directly recursive valuetype test\n")); @@ -306,8 +289,7 @@ directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */, void recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb, - Test::Hello_ptr hello - ACE_ENV_ARG_DECL) + Test::Hello_ptr hello) { ACE_DEBUG ((LM_INFO, "Executing recursive struct via TypeCodeFactory test\n")); @@ -323,13 +305,11 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb, the_any <<= foo; CORBA::TypeCode_var recursive_tc = - orb->create_recursive_tc ("IDL:Test/RecursiveStruct:1.0" - ACE_ENV_ARG_PARAMETER); + orb->create_recursive_tc ("IDL:Test/RecursiveStruct:1.0"); CORBA::TypeCode_var seq_tc = orb->create_sequence_tc (0, - recursive_tc.in () - ACE_ENV_ARG_PARAMETER); + recursive_tc.in ()); CORBA::StructMemberSeq members (3); members.length (3); @@ -343,23 +323,19 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb, CORBA::TypeCode_var struct_tc = orb->create_struct_tc ("IDL:Test/RecursiveStruct:1.0", "RecursiveStruct", - members - ACE_ENV_ARG_PARAMETER); + members); // Reset the underlying TypeCode to the one we just created with the // TypeCodeFactory. - the_any.type (struct_tc.in () - ACE_ENV_ARG_PARAMETER); + the_any.type (struct_tc.in ()); ::perform_invocation<Test::RecursiveStruct> (hello, - the_any - ACE_ENV_ARG_PARAMETER); + the_any); } void recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr /* hello */ - ACE_ENV_ARG_DECL_NOT_USED) + Test::Hello_ptr /* hello */) { ACE_DEBUG ((LM_INFO, "Executing recursive union via TypeCodeFactory test\n")); @@ -371,8 +347,7 @@ recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */, void indirectly_recursive_valuetype_typecodefactory_test ( CORBA::ORB_ptr /* orb */, - Test::Hello_ptr /* hello */ - ACE_ENV_ARG_DECL_NOT_USED) + Test::Hello_ptr /* hello */) { ACE_DEBUG ((LM_INFO, "Executing indirectly recursive valuetype via " @@ -384,8 +359,7 @@ indirectly_recursive_valuetype_typecodefactory_test ( void directly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */, - Test::Hello_ptr /* hello */ - ACE_ENV_ARG_DECL_NOT_USED) + Test::Hello_ptr /* hello */) { ACE_DEBUG ((LM_INFO, "Executing directly recursive valuetype via " @@ -419,21 +393,17 @@ struct Caller : public std::unary_function<T, void> /// Function call operator overload. void operator() (T f) { - ACE_DECLARE_NEW_ENV; - ACE_TRY + try { f (orb.in (), - hello.in () - ACE_ENV_ARG_PARAMETER); + hello.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception thrown:"); + ex._tao_print_exception ("Exception thrown:"); success = false; } - ACE_ENDTRY; } CORBA::ORB_var orb; @@ -444,19 +414,19 @@ struct Caller : public std::unary_function<T, void> int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -467,8 +437,7 @@ main (int argc, char *argv[]) } typedef void (*test_func) (CORBA::ORB_ptr, - Test::Hello_ptr - ACE_ENV_ARG_DECL); + Test::Hello_ptr); static test_func const tests[] = { @@ -495,19 +464,17 @@ main (int argc, char *argv[]) hello.in ())); if (!c.success) - ACE_TRY_THROW (Test::Recursive_Type_In_Any_Test_Failed ()); + throw Test::Recursive_Type_In_Any_Test_Failed (); hello->shutdown (); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp index 245c288e5c8..8c998950dd3 100644 --- a/TAO/tests/Any/Recursive/server.cpp +++ b/TAO/tests/Any/Recursive/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 584665586f7..a6523c6733c 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -42,13 +42,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -69,8 +69,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -78,8 +77,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -95,10 +93,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -115,12 +113,11 @@ main (int argc, char *argv[]) callback_impl._this (); // Send the calback object to the server - server->callback_object (callback.in () - ACE_ENV_ARG_PARAMETER); + server->callback_object (callback.in ()); // A method to kickstart callbacks from the server CORBA::Long r = - server->test_method (1 ACE_ENV_ARG_PARAMETER); + server->test_method (1); if (r != 0) { @@ -131,16 +128,14 @@ main (int argc, char *argv[]) orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index d1ecad1ccc6..0b8c678b717 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -79,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -102,15 +100,13 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("simple_server"); child_poa->activate_object_with_id (id.in (), - &server_impl - ACE_ENV_ARG_PARAMETER); + &server_impl); CORBA::Object_var obj = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -146,15 +142,13 @@ main (int argc, char *argv[]) } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index d4e45160e83..dedcddd24ec 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -18,11 +18,11 @@ Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void -Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) @@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -89,5 +89,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 7958d4fb10f..33333f74968 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -58,12 +58,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)); - void callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED) + void callback_object (Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index ad33e1782be..86d6a8a89bb 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -79,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -96,10 +94,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -120,13 +118,12 @@ main (int argc, char *argv[]) callback_impl->_this (); // Send the calback object to the server - server->callback_object (callback.in () - ACE_ENV_ARG_PARAMETER); + server->callback_object (callback.in ()); // 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); + server->test_method (1); if (r != 0) { @@ -137,21 +134,19 @@ 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); + orb->run (run_time); // Shutdown the server server->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp index 457ef999087..8a882d8bc9c 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -79,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -107,15 +105,13 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("simple_server"); child_poa->activate_object_with_id (id.in (), - server_impl - ACE_ENV_ARG_PARAMETER); + server_impl); CORBA::Object_var obj = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -137,15 +133,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index e0b8233488c..b79b40c2520 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -18,7 +18,7 @@ Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void @@ -61,8 +61,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, } CORBA::Long -Simple_Server_i::test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL) +Simple_Server_i::test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) @@ -88,7 +87,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -100,5 +99,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (false ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index f78ba42db26..040bb9a9f53 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -58,12 +58,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)); - void callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED) + void callback_object (Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index 7cbea7f62d4..0a2bcf74537 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -30,19 +30,17 @@ test_with_bidir_poa (int argc, const char *orb_name, int destroy_orb) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -55,8 +53,7 @@ test_with_bidir_poa (int argc, pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -64,8 +61,7 @@ test_with_bidir_poa (int argc, PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -78,19 +74,17 @@ test_with_bidir_poa (int argc, poa_manager->activate (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); if (destroy_orb) { orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 2299c38d181..7825c600db7 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -79,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -96,10 +94,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -120,13 +118,12 @@ main (int argc, char *argv[]) callback_impl->_this (); // Send the calback object to the server - server->callback_object (callback.in () - ACE_ENV_ARG_PARAMETER); + server->callback_object (callback.in ()); // Call the client that will make remote calls CORBA::Long r = - server->test_method (1 ACE_ENV_ARG_PARAMETER); + server->test_method (1); if (r != 0) { @@ -138,16 +135,14 @@ main (int argc, char *argv[]) // Shutdown the server server->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index 457ef999087..8a882d8bc9c 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -79,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -107,15 +105,13 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("simple_server"); child_poa->activate_object_with_id (id.in (), - server_impl - ACE_ENV_ARG_PARAMETER); + server_impl); CORBA::Object_var obj = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -137,15 +133,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index eefbbaae959..2b3eb2fd280 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -17,11 +17,11 @@ Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void -Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -32,8 +32,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A // **************************************************************** CORBA::Long -Simple_Server_i::test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL) +Simple_Server_i::test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) @@ -63,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -75,5 +74,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 37d75fcd5c3..8456a5240eb 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -57,12 +57,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Boolean do_callback) ACE_THROW_SPEC ((CORBA::SystemException)); - void callback_object (Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED) + void callback_object (Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp index ac46a38f13a..bfaecaaf55f 100644 --- a/TAO/tests/Big_AMI/ami_test_i.cpp +++ b/TAO/tests/Big_AMI/ami_test_i.cpp @@ -28,8 +28,7 @@ CORBA::Long AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str, - const A::Payload & - ACE_ENV_ARG_DECL_NOT_USED) + const A::Payload &) ACE_THROW_SPEC ((CORBA::SystemException)) { out_l = 931233; diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h index 1fd845370fd..ab16cfdf41f 100644 --- a/TAO/tests/Big_AMI/ami_test_i.h +++ b/TAO/tests/Big_AMI/ami_test_i.h @@ -32,8 +32,7 @@ public: CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str, - const A::Payload &the_payload - ACE_ENV_ARG_DECL) + const A::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 8ee4b1990b0..f018e2c2f84 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -84,8 +84,7 @@ public: } void foo (CORBA::Long ami_return_val, - CORBA::Long out_l - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long out_l) ACE_THROW_SPEC ((CORBA::SystemException)) { ++reply_count_; @@ -98,8 +97,7 @@ public: } }; - void foo_excep (::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + void foo_excep (::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { ++reply_count_; @@ -107,16 +105,15 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called: \n" "Testing proper exception handling ...\n")); - ACE_TRY + try { excep_holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "... caught the wrong exception -> ERROR\n")); } - ACE_ENDTRY; }; private: @@ -127,18 +124,17 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object_var = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa_var = - PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object_var.in ()); PortableServer::POAManager_var poa_manager_var = poa_var->the_POAManager (); @@ -149,10 +145,10 @@ main (int argc, char *argv[]) return 1; // We reuse the object_var smart pointer! - object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + object_var = orb->string_to_object (ior); A::AMI_Test_var ami_test_var = - A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); + A::AMI_Test::_narrow (object_var.in ()); if (CORBA::is_nil (ami_test_var.in ())) { @@ -188,8 +184,7 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), l, "Let's talk AMI.", - payload - ACE_ENV_ARG_PARAMETER); + payload); } // We are just sending all requests, but we shouldn't get any replies @@ -216,8 +211,7 @@ main (int argc, char *argv[]) CORBA::Long number = ami_test_var->foo (l, l, "Let's talk SMI.", - payload - ACE_ENV_ARG_PARAMETER); + payload); if (debug) { @@ -233,17 +227,15 @@ main (int argc, char *argv[]) poa_var->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp index 5b4b5a0523c..f829e76a50f 100644 --- a/TAO/tests/Big_AMI/server.cpp +++ b/TAO/tests/Big_AMI/server.cpp @@ -54,14 +54,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +68,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -83,7 +82,7 @@ main (int argc, char *argv[]) ami_test_i._this (); CORBA::String_var ior = - orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (ami_test_var.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -106,19 +105,17 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 1cc9653db42..1cad2f4c83d 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -29,8 +29,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - Test::Session_List &session_list - ACE_ENV_ARG_DECL) + Test::Session_List &session_list) { session_list.length (this->peer_count_); CORBA::ULong count = 0; @@ -43,8 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, payload_size, thread_count, message_count, - this->peer_count_ - ACE_ENV_ARG_PARAMETER); + this->peer_count_); } } @@ -55,22 +53,19 @@ Coordinator::shutdown_all_peers (void) i != this->peers_ + this->peer_count_; ++i) { - ACE_TRY + try { (*i)->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Coordinator::shutdown, ignored"); + ex._tao_print_exception ("Coordinator::shutdown, ignored"); } - ACE_ENDTRY; } } void -Coordinator::add_peer (Test::Peer_ptr peer - ACE_ENV_ARG_DECL_NOT_USED) +Coordinator::add_peer (Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->peer_count_ >= this->peer_max_) diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h index ae490a3fea2..76bd88d5fa8 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -25,15 +25,13 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - Test::Session_List &session_list - ACE_ENV_ARG_DECL); + Test::Session_List &session_list); /// Shutdown all the peers void shutdown_all_peers (void); // = The skeleton methods - virtual void add_peer (Test::Peer_ptr peer - ACE_ENV_ARG_DECL) + virtual void add_peer (Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index 4827594d14f..d6d4077ac20 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -20,8 +20,7 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count - ACE_ENV_ARG_DECL) + CORBA::ULong peer_count) ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl = 0; @@ -46,5 +45,5 @@ Peer::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h index d3faaf28db4..8f2d18e8445 100644 --- a/TAO/tests/Big_Oneways/Peer.h +++ b/TAO/tests/Big_Oneways/Peer.h @@ -24,8 +24,7 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count - ACE_ENV_ARG_DECL) + CORBA::ULong peer_count) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index 5a46073900d..752850ac50d 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -33,8 +33,7 @@ Session::svc (void) this->barrier_.wait (); CORBA::ULong i = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Use the same payload over and over Test::Payload payload (this->payload_size_); @@ -64,8 +63,7 @@ Session::svc (void) #endif /* 0 */ for (CORBA::ULong j = 0; j != session_count; ++j) { - this->other_sessions_[j]->receive_payload (payload - ACE_ENV_ARG_PARAMETER); + this->other_sessions_[j]->receive_payload (payload); } } @@ -77,18 +75,17 @@ Session::svc (void) return 0; } } - this->terminate (1 ACE_ENV_ARG_PARAMETER); + this->terminate (1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Session::svc, " "send %d messages out of %d\n", i, message_count_)); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - "); + ex._tao_print_exception ("Session::svc - "); return -1; } - ACE_ENDTRY; this->_remove_ref (); @@ -104,32 +101,30 @@ Session::validate_connections (void) { for (CORBA::ULong j = 0; j != session_count; ++j) { - ACE_TRY + try { this->other_sessions_[j]->ping (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } } } void -Session::start (const Test::Session_List &other_sessions - ACE_ENV_ARG_DECL) +Session::start (const Test::Session_List &other_sessions) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)) { if (other_sessions.length () == 0) - ACE_THROW (Test::No_Peers ()); + throw Test::No_Peers (); { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->running_) - ACE_THROW (Test::Already_Running ()); + throw Test::Already_Running (); this->other_sessions_ = other_sessions; @@ -137,7 +132,7 @@ Session::start (const Test::Session_List &other_sessions { // Increase the reference count because the new thread will have // access to this object.... - ACE_TRY + try { this->_add_ref (); @@ -152,12 +147,10 @@ Session::start (const Test::Session_List &other_sessions this->active_thread_count_++; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Session::start, ignored"); + ex._tao_print_exception ("Session::start, ignored"); } - ACE_ENDTRY; } if (this->active_thread_count_ != this->thread_count_) @@ -173,7 +166,7 @@ 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); + this->terminate (0); } void @@ -182,8 +175,7 @@ Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) } void -Session::receive_payload (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) +Session::receive_payload (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) @@ -220,7 +212,7 @@ Session::receive_payload (const Test::Payload &the_payload if (this->more_work ()) return; } - this->terminate (1 ACE_ENV_ARG_PARAMETER); + this->terminate (1); } @@ -233,8 +225,8 @@ Session::destroy (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (oid.in ()); } int @@ -249,22 +241,17 @@ Session::more_work (void) const } void -Session::terminate (CORBA::Boolean success - ACE_ENV_ARG_DECL) +Session::terminate (CORBA::Boolean success) ACE_THROW_SPEC (()) { // Make sure that global resources are released - ACE_TRY_EX(GLOBAL) + try { - this->control_->session_finished (success - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(GLOBAL); + this->control_->session_finished (success); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Session::terminate, ignored"); + ex._tao_print_exception ("Session::terminate, ignored"); } - ACE_ENDTRY; } diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 13577bbce93..8dc4dcaafab 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -35,8 +35,7 @@ public: int svc (void); // = The skeleton methods - virtual void start (const Test::Session_List &other_sessions - ACE_ENV_ARG_DECL) + virtual void start (const Test::Session_List &other_sessions) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)); @@ -44,8 +43,7 @@ public: virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_payload (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) + virtual void receive_payload (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy (void) @@ -54,8 +52,7 @@ public: private: /// Helper function used to report any problems and destroy local /// resources - void terminate (CORBA::Boolean success - ACE_ENV_ARG_DECL) + void terminate (CORBA::Boolean success) ACE_THROW_SPEC (()); /// Return 1 if all the work in this session has been completed diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index f34179bc9bb..fdd01686c9d 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -41,8 +41,7 @@ Session_Control::~Session_Control (void) } void -Session_Control::session_finished (CORBA::Boolean success - ACE_ENV_ARG_DECL) +Session_Control::session_finished (CORBA::Boolean success) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -65,8 +64,8 @@ Session_Control::session_finished (CORBA::Boolean success PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (oid.in ()); } } diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h index 2f0232be6d8..3e12b1df5e1 100644 --- a/TAO/tests/Big_Oneways/Session_Control.h +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -26,8 +26,7 @@ public: int all_sessions_finished (void) const; // = The skeleton methods - virtual void session_finished (CORBA::Boolean success - ACE_ENV_ARG_DECL) + virtual void session_finished (CORBA::Boolean success) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 6c93cc0348e..ff908dc6fc9 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,10 +60,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Coordinator_var coordinator = - Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Coordinator::_narrow(tmp.in ()); if (CORBA::is_nil (coordinator.in ())) { @@ -84,24 +84,22 @@ main (int argc, char *argv[]) poa_manager->activate (); - coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); + coordinator->add_peer (peer.in ()); orb->run (); // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 35d83b375e1..55a4cbdef12 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -62,16 +62,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -93,7 +93,7 @@ main (int argc, char *argv[]) coordinator_impl->_this (); CORBA::String_var ior = - orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -113,7 +113,7 @@ main (int argc, char *argv[]) ++i) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -139,8 +139,7 @@ main (int argc, char *argv[]) payload_size, thread_count, message_count, - session_list - ACE_ENV_ARG_PARAMETER); + session_list); ACE_ASSERT (session_list.length () == peer_count); @@ -162,8 +161,7 @@ main (int argc, char *argv[]) Test::Session::_duplicate (session_list[k]); } - session_list[j]->start (other_sessions - ACE_ENV_ARG_PARAMETER); + session_list[j]->start (other_sessions); } @@ -174,7 +172,7 @@ main (int argc, char *argv[]) ++k) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } if (!session_control_impl->all_sessions_finished ()) @@ -198,17 +196,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp index 40b9cca6846..04f7a0f74ee 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.cpp +++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp @@ -14,7 +14,7 @@ Big_Reply_i::~Big_Reply_i (void) } Test::Octet_Seq * -Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::get_big_reply ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { Test::Octet_Seq_var reply_mesg = @@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_AR } void -Big_Reply_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::ping ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Big_Reply_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::shutdown ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index 0f65d6169a0..e6ae93ff2e8 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -26,10 +26,9 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting big reply\n")); - ACE_DECLARE_NEW_CORBA_ENV; // Now get the big replies.. - ACE_TRY + try { for (int i = 0; i != this->event_count_; ++i) { @@ -37,13 +36,11 @@ Client_Task::svc (void) this->reply_gen_->get_big_reply (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception Caught\n"); + ex._tao_print_exception ("Exception Caught\n"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; @@ -54,7 +51,6 @@ Client_Task::validate_connection (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Validating connection ..\n")); - ACE_DECLARE_NEW_CORBA_ENV; // Try to setup a connection to the remote server, ignoring all the // exceptions that are expected (see bug 189 on why it is so). We @@ -62,12 +58,11 @@ Client_Task::validate_connection (void) // to work with Minimum CORBA builds too.. for (int i = 0; i != 100; ++i) { - ACE_TRY + try { this->reply_gen_->ping (); } - ACE_CATCHANY {} - ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } } diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 8a825108629..65b17586ae0 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -35,19 +35,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Big_Reply_var reply_gen = - Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Big_Reply::_narrow(tmp.in ()); if (CORBA::is_nil (reply_gen.in ())) { @@ -75,13 +75,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index b7b6a59226d..e441dc3110e 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -43,13 +43,13 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "Starting server\n")); - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -80,8 +80,7 @@ main (int argc, char *argv[]) big_reply_gen->_this (); CORBA::String_var ior = - orb->object_to_string (big_reply.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (big_reply.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -98,15 +97,13 @@ main (int argc, char *argv[]) orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Ending server\n")); diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index fa7e0375eb1..c6bad09ef62 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -32,26 +32,26 @@ Client_Task::done(void) const } void -Client_Task::do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL) +Client_Task::do_invocations(Test::Payload& payload) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s sending %d payloads.\n", this->id_.c_str(), this->event_count_)); for (int i = 0; i != this->event_count_; ++i) { - this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER); + this->payload_receiver_->more_data (payload); } } void -Client_Task::do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL) +Client_Task::do_sync_none_invocations(Test::Payload& payload) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s sending %d SYNC_NONE payloads.\n", this->id_.c_str(), this->event_count_)); for (int i = 0; i != this->event_count_; ++i) { - this->payload_receiver_->sync_none_more_data (payload ACE_ENV_ARG_PARAMETER); + this->payload_receiver_->sync_none_more_data (payload); } } @@ -65,16 +65,14 @@ Client_Task::svc (void) for (CORBA::ULong j = 0; j != payload.length (); ++j) payload[j] = (j % 256); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->validate_connection (); CORBA::Object_var object = - this->orb_->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); CORBA::Any scope_as_any; scope_as_any <<= this->sync_scope_; @@ -84,28 +82,25 @@ Client_Task::svc (void) policy_list.length (1); policy_list[0] = this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policy_current->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); if (this->sync_scope_ == Messaging::SYNC_NONE) - this->do_sync_none_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER); + this->do_sync_none_invocations(payload); else - this->do_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER); + this->do_invocations(payload); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s: ", this->id_.c_str())); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); done_ = true; return -1; } - ACE_ENDTRY; ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s finished.\n", this->id_.c_str())); done_ = true; return 0; @@ -114,13 +109,13 @@ Client_Task::svc (void) void Client_Task::validate_connection (void) { - ACE_TRY + try { Test::Payload payload(0); for (int i = 0; i != 100; ++i) { - (void) this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER); + (void) this->payload_receiver_->more_data (payload); } } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index 239e12701ea..408d7458438 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -38,8 +38,8 @@ private: /// workaround bug 189 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); + void do_invocations(Test::Payload& payload); + void do_sync_none_invocations(Test::Payload& payload); private: /// Reference to the test interface diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp index e3203f20359..917276b28f4 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver () } void -Payload_Receiver::more_data (const Test::Payload& payload - ACE_ENV_ARG_DECL_NOT_USED) +Payload_Receiver::more_data (const Test::Payload& payload) ACE_THROW_SPEC ((CORBA::SystemException)) { if (payload.length() > 0) @@ -23,8 +22,7 @@ Payload_Receiver::more_data (const Test::Payload& payload } void -Payload_Receiver::sync_none_more_data (const Test::Payload& payload - ACE_ENV_ARG_DECL_NOT_USED) +Payload_Receiver::sync_none_more_data (const Test::Payload& payload) ACE_THROW_SPEC ((CORBA::SystemException)) { if (payload.length() > 0) diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h index 130ebba266e..1aa87ca3735 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -19,12 +19,10 @@ public: Payload_Receiver (); // = The skeleton methods - virtual void more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) + virtual void more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync_none_more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) + virtual void sync_none_more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)); int count(bool sync_none = false) const; diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index b3ec79aac4b..5f9e816cf70 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -45,19 +45,19 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "(%P) Starting client\n")); - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Payload_Receiver_var payload_receiver = - Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Payload_Receiver::_narrow(tmp.in ()); if (CORBA::is_nil (payload_receiver.in ())) { @@ -107,7 +107,7 @@ main (int argc, char *argv[]) while (ACE_OS::gettimeofday() < end_time) { ACE_Time_Value tv (0, 100 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); if (task0.done() && task1.done() && task2.done()) break; } @@ -118,18 +118,16 @@ main (int argc, char *argv[]) while (orb->work_pending()) { ACE_Time_Value tv(0, 100 * 1000); - orb->run(tv ACE_ENV_ARG_PARAMETER); + orb->run(tv); } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P) Ending client\n")); diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 3d9d03a6a3b..e52c688cbde 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -47,13 +47,13 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "Starting server\n")); - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,7 +61,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -79,7 +79,7 @@ main (int argc, char *argv[]) payload_receiver_impl->_this (); CORBA::String_var ior = - orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (payload_receiver.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -106,7 +106,7 @@ main (int argc, char *argv[]) int prev_count = count; int sn_prev_count = sn_count; ACE_Time_Value tv(0, 100 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); count = payload_receiver_impl->count(); sn_count = payload_receiver_impl->count(true); if ((count < expected && count == prev_count) || @@ -148,17 +148,16 @@ main (int argc, char *argv[]) count, expected, payload_receiver_impl->count(true), runtime.sec(), runtime.usec())); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); return result; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Ending server\n")); diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 1cc9653db42..1cad2f4c83d 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -29,8 +29,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - Test::Session_List &session_list - ACE_ENV_ARG_DECL) + Test::Session_List &session_list) { session_list.length (this->peer_count_); CORBA::ULong count = 0; @@ -43,8 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, payload_size, thread_count, message_count, - this->peer_count_ - ACE_ENV_ARG_PARAMETER); + this->peer_count_); } } @@ -55,22 +53,19 @@ Coordinator::shutdown_all_peers (void) i != this->peers_ + this->peer_count_; ++i) { - ACE_TRY + try { (*i)->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Coordinator::shutdown, ignored"); + ex._tao_print_exception ("Coordinator::shutdown, ignored"); } - ACE_ENDTRY; } } void -Coordinator::add_peer (Test::Peer_ptr peer - ACE_ENV_ARG_DECL_NOT_USED) +Coordinator::add_peer (Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->peer_count_ >= this->peer_max_) diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h index 2c2a34d282c..8aa64f5ceca 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -24,15 +24,13 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - Test::Session_List &session_list - ACE_ENV_ARG_DECL); + Test::Session_List &session_list); /// Shutdown all the peers void shutdown_all_peers (void); // = The skeleton methods - virtual void add_peer (Test::Peer_ptr peer - ACE_ENV_ARG_DECL) + virtual void add_peer (Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index 4827594d14f..d6d4077ac20 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -20,8 +20,7 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count - ACE_ENV_ARG_DECL) + CORBA::ULong peer_count) ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl = 0; @@ -46,5 +45,5 @@ Peer::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index d3faaf28db4..8f2d18e8445 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -24,8 +24,7 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count - ACE_ENV_ARG_DECL) + CORBA::ULong peer_count) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index 0a9452934c1..b968207076e 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -37,8 +37,7 @@ Session::svc (void) PortableServer::ServantBase_var auto_decrement (this); CORBA::ULong i = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Use the same payload over and over Test::Payload payload (this->payload_size_); @@ -62,8 +61,7 @@ Session::svc (void) for (CORBA::ULong j = 0; j != session_count; ++j) { Test::Payload_var received = - this->other_sessions_[j]->echo_payload (payload - ACE_ENV_ARG_PARAMETER); + this->other_sessions_[j]->echo_payload (payload); } } @@ -75,36 +73,34 @@ Session::svc (void) return 0; } } - this->terminate (1 ACE_ENV_ARG_PARAMETER); + this->terminate (1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Session::svc, " "send %d messages out of %d\n", i, message_count_)); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - "); + ex._tao_print_exception ("Session::svc - "); return -1; } - ACE_ENDTRY; return 0; } void -Session::start (const Test::Session_List &other_sessions - ACE_ENV_ARG_DECL) +Session::start (const Test::Session_List &other_sessions) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)) { if (other_sessions.length () == 0) - ACE_THROW (Test::No_Peers ()); + throw Test::No_Peers (); { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->running_) - ACE_THROW (Test::Already_Running ()); + throw Test::Already_Running (); this->other_sessions_ = other_sessions; @@ -112,7 +108,7 @@ Session::start (const Test::Session_List &other_sessions { // Increase the reference count because the new thread will have // access to this object.... - ACE_TRY + try { this->_add_ref (); @@ -127,12 +123,10 @@ Session::start (const Test::Session_List &other_sessions this->active_thread_count_++; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Session::start, ignored"); + ex._tao_print_exception ("Session::start, ignored"); } - ACE_ENDTRY; } if (this->active_thread_count_ != this->thread_count_) @@ -148,12 +142,11 @@ 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); + this->terminate (0); } Test::Payload * -Session::echo_payload (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) +Session::echo_payload (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) @@ -192,7 +185,7 @@ Session::echo_payload (const Test::Payload &the_payload if (this->more_work ()) return retval._retn (); } - this->terminate (1 ACE_ENV_ARG_PARAMETER); + this->terminate (1); return retval._retn (); } @@ -207,8 +200,8 @@ Session::destroy (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (oid.in ()); } int @@ -230,41 +223,33 @@ Session::validate_connections (void) this->other_sessions_.length (); for (CORBA::ULong j = 0; j != session_count; ++j) { - ACE_TRY + try { #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::PolicyList_var unused; - this->other_sessions_[j]->_validate_connection (unused - ACE_ENV_ARG_PARAMETER); + this->other_sessions_[j]->_validate_connection (unused); #else - (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type" - ACE_ENV_ARG_PARAMETER); + (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type"); #endif /* TAO_HAS_MESSAGING == 1 */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } } void -Session::terminate (CORBA::Boolean success - ACE_ENV_ARG_DECL) +Session::terminate (CORBA::Boolean success) ACE_THROW_SPEC (()) { // Make sure that global resources are released - ACE_TRY_EX(GLOBAL) + try { - this->control_->session_finished (success - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(GLOBAL); + this->control_->session_finished (success); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Session::terminate, ignored"); + ex._tao_print_exception ("Session::terminate, ignored"); } - ACE_ENDTRY; } diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index d7fbdd8e69c..db3d8aed838 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -32,14 +32,12 @@ public: int svc (void); // = The skeleton methods - virtual void start (const Test::Session_List &other_sessions - ACE_ENV_ARG_DECL) + virtual void start (const Test::Session_List &other_sessions) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)); - virtual Test::Payload* echo_payload (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) + virtual Test::Payload* echo_payload (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy (void) @@ -52,8 +50,7 @@ protected: private: /// Helper function used to report any problems and destroy local /// resources - void terminate (CORBA::Boolean success - ACE_ENV_ARG_DECL) + void terminate (CORBA::Boolean success) ACE_THROW_SPEC (()); /// Return 1 if all the work in this session has been completed diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp index 490edf84696..daedcf24ace 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -41,8 +41,7 @@ Session_Control::~Session_Control (void) } void -Session_Control::session_finished (CORBA::Boolean success - ACE_ENV_ARG_DECL) +Session_Control::session_finished (CORBA::Boolean success) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -65,8 +64,8 @@ Session_Control::session_finished (CORBA::Boolean success PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (oid.in ()); } } diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h index 2f0232be6d8..3e12b1df5e1 100644 --- a/TAO/tests/Big_Twoways/Session_Control.h +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -26,8 +26,7 @@ public: int all_sessions_finished (void) const; // = The skeleton methods - virtual void session_finished (CORBA::Boolean success - ACE_ENV_ARG_DECL) + virtual void session_finished (CORBA::Boolean success) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 6c93cc0348e..ff908dc6fc9 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,10 +60,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Coordinator_var coordinator = - Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Coordinator::_narrow(tmp.in ()); if (CORBA::is_nil (coordinator.in ())) { @@ -84,24 +84,22 @@ main (int argc, char *argv[]) poa_manager->activate (); - coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); + coordinator->add_peer (peer.in ()); orb->run (); // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index b8a809f77e7..e2f3fea8702 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -62,16 +62,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -93,7 +93,7 @@ main (int argc, char *argv[]) coordinator_impl->_this (); CORBA::String_var ior = - orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -113,7 +113,7 @@ main (int argc, char *argv[]) ++i) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -139,8 +139,7 @@ main (int argc, char *argv[]) payload_size, thread_count, message_count, - session_list - ACE_ENV_ARG_PARAMETER); + session_list); ACE_ASSERT (session_list.length () == peer_count); ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -161,8 +160,7 @@ main (int argc, char *argv[]) Test::Session::_duplicate (session_list[k]); } - session_list[j]->start (other_sessions - ACE_ENV_ARG_PARAMETER); + session_list[j]->start (other_sessions); } @@ -174,7 +172,7 @@ main (int argc, char *argv[]) ++k) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } if (!session_control_impl->all_sessions_finished ()) @@ -201,17 +199,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index f549f38b0c5..cfd9e6876eb 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -13,8 +13,7 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb) void Blocking_Sync_None::slow_operation (const Test::Payload &, - CORBA::ULong sleep_microseconds - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong sleep_microseconds) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value sleep_time (0, sleep_microseconds); @@ -25,5 +24,5 @@ void Blocking_Sync_None::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 423ac842001..293f76eedb3 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -18,8 +18,7 @@ public: // = The skeleton methods virtual void slow_operation (const Test::Payload &the_payload, - CORBA::ULong sleep_microseconds - ACE_ENV_ARG_DECL) + CORBA::ULong sleep_microseconds) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index 49fe51a87e4..422a95b6410 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -45,19 +45,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Blocking_Sync_None_var blocking_sync_none = - Test::Blocking_Sync_None::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Blocking_Sync_None::_narrow(tmp.in ()); if (CORBA::is_nil (blocking_sync_none.in ())) ACE_ERROR_RETURN ((LM_DEBUG, @@ -66,10 +66,10 @@ main (int argc, char *argv[]) 1); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -82,11 +82,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -104,8 +102,7 @@ main (int argc, char *argv[]) ACE_Time_Value start = ACE_OS::gettimeofday (); blocking_sync_none->slow_operation (payload, - sleep_microseconds - ACE_ENV_ARG_PARAMETER); + sleep_microseconds); ACE_Time_Value elapsed = ACE_OS::gettimeofday (); elapsed -= start; @@ -135,13 +132,11 @@ main (int argc, char *argv[]) blocked_calls)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index 03eeda03140..8003b059ee1 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) blocking_sync_none_impl->_this (); CORBA::String_var ior = - orb->object_to_string (blocking_sync_none.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (blocking_sync_none.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,17 +87,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp index 52f2916ba6a..3df46e7833f 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp @@ -14,17 +14,15 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb) int Client_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp index fefd938cd40..4be8b6bf261 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp @@ -12,8 +12,7 @@ Echo::Echo(CORBA::ORB_ptr orb, } void -Echo::echo_payload (Test::Payload & - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_payload (Test::Payload &) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h index 8175f5ec3a3..7a15abb76a1 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h @@ -18,8 +18,7 @@ public: Echo (CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload & data - ACE_ENV_ARG_DECL) + virtual void echo_payload (Test::Payload & data) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index f655354c4ea..15363bf0055 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -11,8 +11,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) } void -Echo_Caller::start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Caller::start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)) { Server_Task task (client, @@ -36,5 +35,5 @@ Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); - orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown(0); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h index 54b90175c3d..e1982629dc8 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h @@ -15,8 +15,7 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller (CORBA::ORB_ptr orb); - virtual void start_task (Test::Echo_ptr client - ACE_ENV_ARG_DECL) + virtual void start_task (Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp index 538195d07db..8457c6b5eac 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp @@ -20,22 +20,19 @@ Server_Task::svc (void) Test::Payload payload (32768); payload.length (32768); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Send messages till the remote guy crashes for (;;) { - this->echo_->echo_payload (payload - ACE_ENV_ARG_PARAMETER); + this->echo_->echo_payload (payload); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; 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 9a344d4bfc9..d3f030ae01e 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -43,19 +43,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,12 +63,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -86,12 +81,10 @@ main (int argc, char *argv[]) policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policy_current->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -115,12 +108,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (echo.in ())) { @@ -134,8 +125,7 @@ main (int argc, char *argv[]) Client_Task ctask (orb.in ()); - server->start_task (echo.in() - ACE_ENV_ARG_PARAMETER); + server->start_task (echo.in()); if (ctask.activate (THR_NEW_LWP | THR_JOINABLE, 4, @@ -153,18 +143,15 @@ main (int argc, char *argv[]) // Actually the code here should never be reached. root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 5dca3937b4c..f915f225b94 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -41,19 +41,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,8 +80,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -104,18 +100,15 @@ main (int argc, char *argv[]) "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp index 3bfcf379a01..17b6386b824 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo.cpp @@ -16,8 +16,7 @@ Echo::Echo(CORBA::ORB_ptr orb) } Test::Payload * -Echo::echo_payload(Test::Payload const & - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_payload(Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_Time_Value tick(0, 10000); diff --git a/TAO/tests/Bug_1020_Regression/Echo.h b/TAO/tests/Bug_1020_Regression/Echo.h index e6928d28bb0..33bac647e08 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.h +++ b/TAO/tests/Bug_1020_Regression/Echo.h @@ -15,8 +15,7 @@ class Echo : public POA_Test::Echo public: Echo(CORBA::ORB_ptr orb); - virtual Test::Payload * echo_payload (Test::Payload const & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual Test::Payload * echo_payload (Test::Payload const & data) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.h b/TAO/tests/Bug_1020_Regression/Echo_Callback.h index 8bbc6465755..b70effe7c0c 100644 --- a/TAO/tests/Bug_1020_Regression/Echo_Callback.h +++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.h @@ -15,11 +15,9 @@ class Echo_Callback : public POA_Test::AMI_EchoHandler public: Echo_Callback(); - virtual void echo_payload (Test::Payload const & ami_return_val - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void echo_payload (Test::Payload const & ami_return_val) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder) ACE_THROW_SPEC((CORBA::SystemException)); }; diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp index 6a73f8d408b..c2645f8354e 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp @@ -19,14 +19,12 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb) int ORB_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run(); } - ACE_CATCH(CORBA::Exception, ex) + catch (const CORBA::Exception& ) { } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index 6e9ca1d48bf..7ba22c46be5 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -18,23 +18,20 @@ Server_Task::Server_Task(Test::Echo_ptr echo) int Server_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; Test::Payload pload(16); pload.length(16); int stop_loop = 0; for(int i = 0; i != 1000000 && !stop_loop; ++i) { - ACE_TRY + try { Test::Payload_var result = - this->echo_->echo_payload (pload - ACE_ENV_ARG_PARAMETER); + this->echo_->echo_payload (pload); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { stop_loop = 1; } - ACE_ENDTRY; } return 0; } diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp index 86127418175..5cc24c66548 100644 --- a/TAO/tests/Bug_1020_Regression/Server_i.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp @@ -10,8 +10,7 @@ Server::Server(CORBA::ORB_ptr orb) } void -Server::start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_NOT_USED) +Server::start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)) { Server_Task * task = diff --git a/TAO/tests/Bug_1020_Regression/Server_i.h b/TAO/tests/Bug_1020_Regression/Server_i.h index 75fb33dbdd0..b2f1e875701 100644 --- a/TAO/tests/Bug_1020_Regression/Server_i.h +++ b/TAO/tests/Bug_1020_Regression/Server_i.h @@ -16,8 +16,7 @@ class Server : public POA_Test::Server public: Server(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index 3019729ab21..7e94826a604 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -28,19 +28,16 @@ public: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,10 +48,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -67,11 +64,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -95,12 +90,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Server_var server = - Test::Server::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Server::_narrow(tmp.in ()); if (CORBA::is_nil (echo.in ())) { @@ -125,26 +118,22 @@ main (int argc, char *argv[]) Test::Payload payload(16); payload.length(16); for(int i = 0; i != 4; ++i) { - server->start_task(echo.in() - ACE_ENV_ARG_PARAMETER); + server->start_task(echo.in()); } task.wait(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); - root_poa->destroy (1, 1 - ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index 7a71e62d37b..2fac24acb2d 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -28,19 +28,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +48,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); if (parse_args (argc, argv) != 0) return 1; @@ -73,8 +70,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -95,18 +91,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp index 76751139346..3fbc4fdaa62 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp +++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp @@ -15,7 +15,6 @@ void BlobServerImpl::test( BlobType1& blob1, BlobType2& blob2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -38,5 +37,5 @@ void BlobServerImpl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h index a113f088564..54eeb3bfdd8 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.h +++ b/TAO/tests/Bug_1254_Regression/BlobServer.h @@ -19,7 +19,6 @@ public: virtual void test( BlobType1& blob1, BlobType2& blob2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp index 79d2f2acb46..57ecb1553c5 100644 --- a/TAO/tests/Bug_1254_Regression/client.cpp +++ b/TAO/tests/Bug_1254_Regression/client.cpp @@ -34,16 +34,16 @@ parse_args (int argc, char *argv[]) int main(int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); BlobServer_var blobServer = BlobServer::_narrow(tmp.in()); if(CORBA::is_nil(blobServer.in())) @@ -96,13 +96,11 @@ int main(int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp index 75fcaf9f749..97c8d6bc4c3 100644 --- a/TAO/tests/Bug_1254_Regression/server.cpp +++ b/TAO/tests/Bug_1254_Regression/server.cpp @@ -36,16 +36,16 @@ parse_args (int argc, char *argv[]) int main(int argc, char** argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,7 +68,7 @@ int main(int argc, char** argv) blob_impl->_this (); CORBA::String_var ior = - orb->object_to_string (blob.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (blob.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,17 +86,15 @@ int 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1269_Regression/Echo.cpp b/TAO/tests/Bug_1269_Regression/Echo.cpp index df84e9fcbf1..32009b9c996 100644 --- a/TAO/tests/Bug_1269_Regression/Echo.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo.cpp @@ -19,8 +19,7 @@ Echo::Echo(CORBA::ORB_ptr orb, } void -Echo::echo_payload(Test::Payload const & - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_payload(Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; diff --git a/TAO/tests/Bug_1269_Regression/Echo.h b/TAO/tests/Bug_1269_Regression/Echo.h index 4f1f2938ca6..676c856d3b1 100644 --- a/TAO/tests/Bug_1269_Regression/Echo.h +++ b/TAO/tests/Bug_1269_Regression/Echo.h @@ -16,8 +16,7 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void echo_payload (Test::Payload const & data) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp index d9e58008e93..a9fcb25f53c 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp @@ -18,8 +18,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) } void -Echo_Caller::start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Caller::start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)) { Server_Timer * task = @@ -36,5 +35,5 @@ Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); - orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown(0); } diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h index bd37e452e06..3a62bc0d88e 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h @@ -15,8 +15,7 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown(void) diff --git a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp index 34021c71895..6bb058a7ac9 100644 --- a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp @@ -19,14 +19,12 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb) int ORB_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run(); } - ACE_CATCH(CORBA::Exception, ex) + catch (const CORBA::Exception& ) { } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp index ba69beb0473..fa92c34a00b 100644 --- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp @@ -34,8 +34,7 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) ACE_OS::memset(pload.get_buffer(), pload.length(), 0); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Test::Echo_var echo = Test::Echo::_duplicate (this->echo_.in()); @@ -43,13 +42,12 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) if(CORBA::is_nil (echo.in())) return 0; - echo->echo_payload (pload - ACE_ENV_ARG_PARAMETER); + echo->echo_payload (pload); ACE_Time_Value tv (0, 20000); this->reactor()->schedule_timer (this, 0, tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->echo_ = Test::Echo::_nil (); @@ -57,7 +55,6 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 3cdfecd57f9..4a5dff34ca6 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -18,19 +18,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -41,10 +38,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -57,11 +54,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -85,12 +80,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (echo.in ())) { @@ -102,26 +95,22 @@ main (int argc, char *argv[]) poa_manager->activate (); - server->start_task(echo.in() - ACE_ENV_ARG_PARAMETER); + server->start_task(echo.in()); 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index 87b6b639a4b..05e28d3be64 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -16,19 +16,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -39,7 +36,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); if (parse_args (argc, argv) != 0) return 1; @@ -61,8 +58,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -80,18 +76,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp index 44eb9d5d759..3061618345f 100644 --- a/TAO/tests/Bug_1269_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp @@ -13,22 +13,19 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow (tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -42,13 +39,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp index df37f3c644b..b41ec6256ab 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo.cpp @@ -19,8 +19,7 @@ Echo::Echo(CORBA::ORB_ptr orb, } void -Echo::echo_payload(Test::Payload const & - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_payload(Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; diff --git a/TAO/tests/Bug_1270_Regression/Echo.h b/TAO/tests/Bug_1270_Regression/Echo.h index ba9fc0be452..5e835b6396a 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.h +++ b/TAO/tests/Bug_1270_Regression/Echo.h @@ -18,8 +18,7 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void echo_payload (Test::Payload const & data) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp index cb89caf8cc8..bf42f0b83d5 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -18,8 +18,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) } void -Echo_Caller::start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Caller::start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)) { Server_Timer * task = @@ -36,5 +35,5 @@ Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); - orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown(0); } diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h index 1e59359fb83..e2a476e4052 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h @@ -16,8 +16,7 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown(void) diff --git a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp index 212bd3ea422..910d86061af 100644 --- a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp @@ -19,14 +19,12 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb) int ORB_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ) { } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp index 3b6d54efa63..0e1697a1c98 100644 --- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp @@ -37,8 +37,7 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) ACE_OS::memset (pload.get_buffer(), pload.length(), 0); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Test::Echo_var echo = Test::Echo::_duplicate (this->echo_.in ()); @@ -46,17 +45,15 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) if(CORBA::is_nil (echo.in ())) return 0; - echo->echo_payload (pload - ACE_ENV_ARG_PARAMETER); + echo->echo_payload (pload); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->echo_ = Test::Echo::_nil (); if (this->reactor ()->cancel_timer (this) != 0) refcnt_--; } - ACE_ENDTRY; refcnt_--; if(refcnt_ == 0) diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 4370c64aa77..9518e5f17e4 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -19,19 +19,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -42,10 +39,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -58,11 +55,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -86,12 +81,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (echo.in ())) { @@ -103,26 +96,22 @@ main (int argc, char *argv[]) poa_manager->activate (); - server->start_task(echo.in() - ACE_ENV_ARG_PARAMETER); + server->start_task(echo.in()); 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index 33549291602..dfd8ef60c30 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -16,19 +16,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -39,7 +36,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); if (parse_args (argc, argv) != 0) return 1; @@ -61,8 +58,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -80,18 +76,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp index d4635a921d2..8b8eb38a93e 100644 --- a/TAO/tests/Bug_1270_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp @@ -13,22 +13,19 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -42,13 +39,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp index ebaae788c4e..827c5554b26 100644 --- a/TAO/tests/Bug_1330_Regression/client.cpp +++ b/TAO/tests/Bug_1330_Regression/client.cpp @@ -39,19 +39,19 @@ int main (int argc, char *argv[]) { int result = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test_var server = - Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -68,11 +68,10 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { result =1; } - ACE_ENDTRY; return result; } diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index 60e0f87f466..ff3a70b57ca 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -37,15 +37,14 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,7 +52,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -65,19 +64,18 @@ main (int argc, char *argv[]) - root_poa->activate_object ( &server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object ( &server_impl); CORBA::Object_var server = server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); adapter->bind("Name-with-hyphens", ior.in()); @@ -100,15 +98,13 @@ main (int argc, char *argv[]) orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "SERVER (%P): Caught exception:"); + ex._tao_print_exception ("SERVER (%P): Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp index 415abbe7ed3..bc304e7b283 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo.cpp @@ -20,8 +20,7 @@ Echo::Echo(CORBA::ORB_ptr orb, } void -Echo::echo_payload(Test::Payload const & - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_payload(Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; @@ -36,8 +35,7 @@ Echo::echo_payload(Test::Payload const & void Echo::echo_payload_out ( - Test::Payload_out data - ACE_ENV_ARG_DECL_NOT_USED) + Test::Payload_out data) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h index 37812e39b03..3a37b02023d 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.h +++ b/TAO/tests/Bug_1361_Regression/Echo.h @@ -19,13 +19,11 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void echo_payload (Test::Payload const & data) ACE_THROW_SPEC((CORBA::SystemException)); virtual void echo_payload_out ( Test::Payload_out data - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp index da4be180497..4e20b1ece10 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp @@ -20,8 +20,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool) } void -Echo_Caller::start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Caller::start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)) { pool_->put(Test::Echo::_duplicate(client)); @@ -32,5 +31,5 @@ Echo_Caller::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); - orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown(0); } diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h index ed70e9dcc3d..c0551d40b4d 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h @@ -18,8 +18,7 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool_); - virtual void start_task(Test::Echo_ptr client - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void start_task(Test::Echo_ptr client) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown(void) diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp index 7c0af881a1c..e916f9b08f4 100644 --- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp @@ -20,14 +20,12 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb) int ORB_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ) { } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index fc08f3b5e7f..9768757c1a4 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -134,7 +134,7 @@ Thread_Pool::svc (void) // Keep calling a few times after receiving exceptions for(int exception_count = 50; exception_count; --exception_count) { - ACE_TRY_NEW_ENV + try { // keep calling until get an exception while (true) @@ -145,26 +145,23 @@ Thread_Pool::svc (void) Test::Payload pload (10); pload.length (10); ACE_OS::memset (pload.get_buffer(), pload.length(), 0); - echo->echo_payload (pload - ACE_ENV_ARG_PARAMETER); + echo->echo_payload (pload); } else #endif /*if 0*/ { Test::Payload_var pout; - echo->echo_payload_out (pout.out() - ACE_ENV_ARG_PARAMETER); + echo->echo_payload_out (pout.out()); // time_t last_success = ACE_OS::time(); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Just forget the exception and continue } - ACE_ENDTRY; } } diff --git a/TAO/tests/Bug_1361_Regression/Server_Timer.cpp b/TAO/tests/Bug_1361_Regression/Server_Timer.cpp index 0d5ad1bb3e5..d7eeb0b45e4 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Timer.cpp @@ -31,11 +31,10 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) { refcnt_++; - ACE_DECLARE_NEW_CORBA_ENV; Test::Payload pload(1024); pload.length(1024); ACE_OS::memset(pload.get_buffer(), pload.length(), 0); - ACE_TRY + try { Test::Echo_var echo = Test::Echo::_duplicate(this->echo_.in()); if(CORBA::is_nil(echo.in())) @@ -43,14 +42,13 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *) echo->echo_payload(pload); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->echo_ = Test::Echo::_nil (); if(this->reactor()->cancel_timer(this) != 0) refcnt_--; } - ACE_ENDTRY; refcnt_--; if(refcnt_ == 0) diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index f8e173815b0..4c60feb2a30 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -51,19 +51,16 @@ public: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -74,10 +71,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -90,11 +87,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -118,12 +113,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -139,19 +132,16 @@ main (int argc, char *argv[]) worker.activate (THR_NEW_LWP | THR_JOINABLE, serverthreads); - ACE_TRY_EX (BL) + try { for(int i = serverthreads; i; --i) { - server->start_task(echo.in() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (BL); + server->start_task(echo.in()); } } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; Client_Timer * task = new Client_Timer (orb->orb_core()->reactor()); task->activate (); @@ -164,18 +154,15 @@ main (int argc, char *argv[]) "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. - root_poa->destroy (1, 1 - ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index d8ec6ecb7ee..12b14a07905 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -18,19 +18,16 @@ parse_args (int argc, char *argv[]); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -41,8 +38,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); if (parse_args (argc, argv) != 0) return 1; @@ -67,8 +63,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -95,18 +90,15 @@ main (int argc, char *argv[]) worker.wait (); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index 644cf12476e..26161ebfb6f 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -26,22 +26,19 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "Starting shutdown\n")); - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Echo_Caller_var server = - Test::Echo_Caller::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Echo_Caller::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -55,13 +52,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp index 9d231fbb14a..12e18871ff5 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp @@ -25,15 +25,14 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Apply sync_none policy CORBA::Object_var object = - orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -46,10 +45,8 @@ Client_Task::svc (void) CORBA::PolicyList policies (1); policies.length (1); policies[0] = orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + scope_as_any); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -64,13 +61,11 @@ Client_Task::svc (void) ACE_OS::sleep(ACE_Time_Value(0,250000)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught Exception"); + ex._tao_print_exception ("Caught Exception"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp index d8d5e553379..311fba07133 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp +++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp @@ -14,8 +14,7 @@ Sender_i::~Sender_i (void) } void -Sender_i::active_objects (CORBA::ULong no_threads - ACE_ENV_ARG_DECL_NOT_USED) +Sender_i::active_objects (CORBA::ULong no_threads) ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index 14322034e9d..08a78a7e74d 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -32,8 +32,7 @@ public: virtual ~Sender_i (void); // = The skeleton methods - virtual void active_objects (CORBA::ULong ao - ACE_ENV_ARG_DECL) + virtual void active_objects (CORBA::ULong ao) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_ready_message (void) diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp index f5b5ba2c278..7d742e5b8e2 100644 --- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp @@ -17,18 +17,16 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // run the test for at most 30 seconds... ACE_Time_Value tv (15, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp index 3fa3442af8f..13ba1f5adea 100644 --- a/TAO/tests/Bug_1476_Regression/client.cpp +++ b/TAO/tests/Bug_1476_Regression/client.cpp @@ -53,13 +53,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -67,16 +67,16 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -89,10 +89,8 @@ main (int argc, char *argv[]) CORBA::PolicyList policies (1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + scope_as_any); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -101,10 +99,10 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Sender_var sender = - Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Sender::_narrow(tmp.in ()); if (CORBA::is_nil (sender.in ())) { @@ -126,7 +124,7 @@ main (int argc, char *argv[]) // will have two threads that would make invocations.. // 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); + sender->active_objects ((CORBA::Short) number_of_client_tasks); TAO::Transport_Cache_Manager& manager = orb->orb_core()->lane_resources ().transport_cache (); @@ -177,13 +175,11 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index 8e48650bd2f..8aa0a4c762b 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -41,13 +41,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,7 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -73,7 +73,7 @@ main (int argc, char *argv[]) sender_impl->_this (); CORBA::String_var ior = - orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (sender.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -118,17 +118,15 @@ main (int argc, char *argv[]) } } - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp index d6edf70052d..7d17459c398 100644 --- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp @@ -31,8 +31,7 @@ Client_Task::svc (void) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (CORBA::Long j = 0; j != 1000; @@ -41,8 +40,7 @@ Client_Task::svc (void) // Send 25 messages in every loop.. for (CORBA::Short i = 0; i != 25; ++i) { - this->receiver_->sendc_next_prime (this->handler_var_.in () - ACE_ENV_ARG_PARAMETER); + this->receiver_->sendc_next_prime (this->handler_var_.in ()); } CORBA::Short repl = 0; @@ -60,11 +58,10 @@ Client_Task::svc (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index b35f3854035..cac4a472529 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -7,8 +7,7 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o) } void -Reply_Handler::next_prime (CORBA::ULong - ACE_ENV_ARG_DECL_NOT_USED) +Reply_Handler::next_prime (CORBA::ULong) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -16,30 +15,27 @@ Reply_Handler::next_prime (CORBA::ULong void Reply_Handler::next_prime_excep ( - ::Messaging::ExceptionHolder *ex - ACE_ENV_ARG_DECL) + ::Messaging::ExceptionHolder *ex) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { ex->raise_exception (); } - ACE_CATCH (CORBA::COMM_FAILURE, t) + catch (const CORBA::COMM_FAILURE& ) { /*ACE_DEBUG ((LM_DEBUG, "Callback method <next_prime_excep> called: \n")); */ ACE_Time_Value tv (10, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; } diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h index 03700034b3e..4b59d67cef0 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h @@ -14,12 +14,10 @@ public: Reply_Handler (CORBA::ORB_ptr o); - void next_prime (CORBA::ULong ami_return_val - ACE_ENV_ARG_DECL) + void next_prime (CORBA::ULong ami_return_val) ACE_THROW_SPEC ((CORBA::SystemException)); - void next_prime_excep (::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + void next_prime_excep (::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp index 50d733ca3e7..17a394f8f17 100644 --- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp @@ -16,16 +16,14 @@ int Server_Task::svc (void) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index d994f66207c..c0ffd0e54c3 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -38,19 +38,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -61,11 +61,10 @@ main (int argc, char *argv[]) } CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -74,10 +73,9 @@ main (int argc, char *argv[]) CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); TimeBase::TimeT timeout_period = 10 * 1000; @@ -88,12 +86,10 @@ main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - timeout_as_any - ACE_ENV_ARG_PARAMETER); + timeout_as_any); policy_current->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); // Let the client perform the test in a separate thread @@ -111,17 +107,15 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 8d35961807b..fdfbb50b1de 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -99,17 +99,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index 5a85d13a10f..b9afd9b4960 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -14,8 +14,7 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // No Op @@ -23,8 +22,7 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,7 +40,6 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h index 569419fb346..c232ee05e1a 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp index d4454dac1d2..b9584834a8c 100644 --- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp @@ -24,14 +24,13 @@ Client_Task::Client_Task (const char *input, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + corb_->string_to_object (input_); Bug1495_Regression::Bug1495_var server = - Bug1495_Regression::Bug1495::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Bug1495_Regression::Bug1495::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -48,7 +47,7 @@ Client_Task::svc (void) // call the thread_id function on the test object CORBA::Long remote_thread_id; - server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER); + server->get_thread_id (remote_thread_id); ACE_DEBUG ((LM_INFO, "Remote thread ID was %i\n", @@ -73,13 +72,11 @@ Client_Task::svc (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client task:"); + ex._tao_print_exception ("Caught exception in client task:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp index 103c5aee788..132b2dd7568 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp @@ -14,8 +14,7 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // No Op @@ -23,8 +22,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // Install the Echo server request interceptor @@ -35,8 +33,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h index f47e9ce5e68..ee240056609 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h @@ -33,12 +33,10 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the created server request interceptor. Only valid after diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index 97046329a4b..c31aeb51c00 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -30,11 +30,10 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + sorb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -44,7 +43,7 @@ Server_Task::svc (void) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -60,8 +59,7 @@ Server_Task::svc (void) Bug1495_Regression:: Bug1495_var bug1495 = server_impl->_this(); - CORBA::String_var ior = sorb_->object_to_string (bug1495.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var ior = sorb_->object_to_string (bug1495.in ()); if (output_ != 0) { @@ -88,20 +86,18 @@ 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); + sorb_->run (tv); ACE_DEBUG ((LM_DEBUG, "Event loop finished for the thread server.\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught an exception in server task: "); + ex._tao_print_exception ("Caught an exception in server task: "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp index 46172fabcaa..43f8c647866 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp @@ -64,16 +64,14 @@ main (int argc, char *argv[]) return -1; } - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter main_args_s (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (main_args_s.get_argc (), main_args_s.get_TCHAR_argv (), - "Server_ORB" - ACE_ENV_ARG_PARAMETER); + "Server_ORB"); ACE_Manual_Event me; @@ -96,8 +94,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (main_args_c.get_argc (), main_args_c.get_TCHAR_argv (), - "Client_ORB" - ACE_ENV_ARG_PARAMETER); + "Client_ORB"); { Client_Task client_task (ior_input_file, @@ -115,11 +112,10 @@ main (int argc, char *argv[]) corb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // ignore exceptions } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Threaded client ready.\n")); diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp index a42807639fc..0a7f011e481 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -47,7 +47,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Create the ORB initializer. Server_ORBInitializer *temp_initializer = 0; @@ -58,15 +58,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); // Now initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Remote_Server_ORB" ACE_ENV_ARG_PARAMETER); + "Remote_Server_ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -76,7 +75,7 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -101,8 +100,7 @@ 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); + CORBA::Object_var forward_location = orb->string_to_object (ior_input_file); if (CORBA::is_nil (forward_location.in ())) { @@ -112,24 +110,21 @@ main (int argc, char *argv[]) 1); } - server_interceptor->forward_reference (forward_location.in () - ACE_ENV_ARG_PARAMETER); + server_interceptor->forward_reference (forward_location.in ()); Bug1495_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Bug1495_Regression::Bug1495_var server = - Bug1495_Regression::Bug1495::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Bug1495_Regression::Bug1495::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // Output the server IOR to a file if (ior_output_file != 0) @@ -150,7 +145,7 @@ main (int argc, char *argv[]) ACE_Time_Value tv (15, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); if (server_interceptor->forward_location_done() == false) { @@ -158,15 +153,13 @@ main (int argc, char *argv[]) } ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished \n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught an exception in server:"); + ex._tao_print_exception ("Caught an exception in server:"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Threaded Server ready\n")); diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp index cd5c24da242..926acd7cc13 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp @@ -38,8 +38,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -47,8 +46,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -58,8 +56,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ri); @@ -68,8 +65,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -79,8 +75,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h index 5ee9a220c42..705bce07974 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 545156c3359..7767288eba5 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -29,16 +29,15 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } void -Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location - ACE_ENV_ARG_DECL) +Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward_location)) - ACE_THROW (CORBA::INV_OBJREF ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - EINVAL), - CORBA::COMPLETED_NO)); + throw CORBA::INV_OBJREF ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + EINVAL), + CORBA::COMPLETED_NO); this->forward_location_ = CORBA::Object::_duplicate (forward_location); } @@ -57,8 +56,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -83,15 +81,14 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_DEBUG ((LM_DEBUG, "Sending LOCATION_FORWARD, current thread %i\n", ACE_Thread::self ())); - ACE_THROW (PortableInterceptor::ForwardRequest (this->forward_location_)); + throw PortableInterceptor::ForwardRequest (this->forward_location_); } void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -100,8 +97,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { // No op @@ -110,8 +106,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -121,8 +116,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -133,7 +127,7 @@ Echo_Server_Request_Interceptor::send_other ( CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } bool diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h index 874eb6a5f5b..dfcbae7b2c2 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h @@ -33,8 +33,7 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - void forward_reference (CORBA::Object_ptr forward_location - ACE_ENV_ARG_DECL) + void forward_reference (CORBA::Object_ptr forward_location) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * name (void) @@ -44,28 +43,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp index 0fba4bb193e..64f9a568282 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.cpp +++ b/TAO/tests/Bug_1495_Regression/test_i.cpp @@ -28,7 +28,6 @@ Bug1495_i::~Bug1495_i (void) void Bug1495_i::get_thread_id ( CORBA::Long_out thread_id - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -39,7 +38,6 @@ Bug1495_i::get_thread_id ( void Bug1495_i::shutdown ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -51,6 +49,6 @@ Bug1495_i::shutdown ( this->_remove_ref (); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index 7550249543c..146a65f5c07 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -50,7 +50,7 @@ public: virtual ~Bug1495_i (void); virtual - void get_thread_id (CORBA::Long_out thread_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void get_thread_id (CORBA::Long_out thread_id) ACE_THROW_SPEC ((CORBA::SystemException)); virtual diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp index a681be689f6..b2e9b1657b3 100644 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -12,45 +12,38 @@ ACE_RCSID (Bug_1535_Regression, PortableServer::POA_ptr create_persistent_POA (PortableServer::POA_ptr parent, - char const * name - ACE_ENV_ARG_DECL) + char const * name) { TAO::Utils::PolicyList_Destroyer plist (3); plist.length(3); plist[0] = - parent->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + parent->create_lifespan_policy (PortableServer::PERSISTENT); plist[1] = - parent->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + parent->create_id_assignment_policy (PortableServer::USER_ID); plist[2] = parent->create_implicit_activation_policy ( - PortableServer::NO_IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + PortableServer::NO_IMPLICIT_ACTIVATION); PortableServer::POAManager_var mgr = parent->the_POAManager (); return parent->create_POA (name, mgr.in(), - plist - ACE_ENV_ARG_PARAMETER); + plist); } void test_create_object_before_servant_reactivation ( CORBA::ORB_ptr orb, - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root_poa) { // Create a persistent POA and then create a reference in it... PortableServer::POA_var persistent_poa = create_persistent_POA(root_poa, - "T1" - ACE_ENV_ARG_PARAMETER); + "T1"); PortableServer::ObjectId_var oid = @@ -61,8 +54,7 @@ test_create_object_before_servant_reactivation ( CORBA::Object_var object = persistent_poa->create_reference_with_id ( oid.in (), - id - ACE_ENV_ARG_PARAMETER); + id); if (CORBA::is_nil (object.in ())) { @@ -73,8 +65,7 @@ test_create_object_before_servant_reactivation ( } CORBA::String_var ior = - orb->object_to_string (object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object.in ()); // Now destroy the POA... persistent_poa->destroy (true, @@ -83,13 +74,11 @@ test_create_object_before_servant_reactivation ( // Now create the POA again... persistent_poa = create_persistent_POA (root_poa, - "T1" - ACE_ENV_ARG_PARAMETER); + "T1"); // And try to create the object again... object = - orb->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior.in ()); if(CORBA::is_nil (object.in ())) { @@ -99,21 +88,18 @@ test_create_object_before_servant_reactivation ( } persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); + true); } void test_create_object_before_POA_reactivation( CORBA::ORB_ptr orb, - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root_poa) { // Create a persistent POA and then create a reference in it... PortableServer::POA_var persistent_poa = create_persistent_POA (root_poa, - "T2" - ACE_ENV_ARG_PARAMETER); + "T2"); PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId ("TestServant"); @@ -122,8 +108,7 @@ test_create_object_before_POA_reactivation( CORBA::Object_var object = persistent_poa->create_reference_with_id (oid.in (), - id - ACE_ENV_ARG_PARAMETER); + id); if (CORBA::is_nil (object.in ())) { @@ -133,17 +118,14 @@ test_create_object_before_POA_reactivation( } CORBA::String_var ior = - orb->object_to_string (object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object.in ()); // Now destroy the POA... persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); + true); // And try to create the object again... - object = orb->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior.in ()); if (CORBA::is_nil (object.in ())) { @@ -154,45 +136,41 @@ test_create_object_before_POA_reactivation( } persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); + true); } void test_no_implicit_activation ( - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root_poa) { // 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); + "T3"); Hello myhello (persistent_poa.in ()); bool succeed = false; - ACE_TRY_NEW_ENV + try { // Implicit activation should fail Test_var myservant = myhello._this (); } - ACE_CATCH (PortableServer::POA::WrongPolicy, ex) + catch (const PortableServer::POA::WrongPolicy& ) { succeed = true; } - ACE_CATCH (PortableServer::POA::ServantNotActive, ex) + catch (const PortableServer::POA::ServantNotActive& ) { // This is now the case when looking at the corba spec, raised // an issue 10522 about this succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -202,27 +180,24 @@ test_no_implicit_activation ( // Now destroy the POA... persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); + true); } int main (int argc, char *argv[]) { - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); TAO::Utils::ORB_Destroyer orb_destroyer (orb.in()); PortableServer::POA_var root_poa = TAO::Utils::RIR_Narrow<PortableServer::POA>::narrow (orb.in (), - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -230,27 +205,22 @@ main (int argc, char *argv[]) poa_manager->activate (); test_create_object_before_POA_reactivation (orb.in(), - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); test_create_object_before_servant_reactivation (orb.in (), - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); - test_no_implicit_activation (root_poa.in () - ACE_ENV_ARG_PARAMETER); + test_no_implicit_activation (root_poa.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught a CORBA exception \n"); + ex._tao_print_exception ("Caught a CORBA exception \n"); return 1; } - ACE_CATCHALL + catch (...) { return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp index ef782416b3a..a2eda92853d 100644 --- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp @@ -26,8 +26,7 @@ Client_Task::svc (void) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::Object_var object = this->orb_->resolve_initial_references ("PolicyCurrent"); @@ -54,28 +53,22 @@ Client_Task::svc (void) // Start 25 separate concurrent request streams for (CORBA::Short i = 0; i != 25; ++i) { - this->receiver_->sendc_short_sleep (this->handler_var_.in () - ACE_ENV_ARG_PARAMETER); + this->receiver_->sendc_short_sleep (this->handler_var_.in ()); } ACE_Time_Value tv(10, 0); - orb_->run(tv ACE_ENV_ARG_PARAMETER); + orb_->run(tv); } - ACE_CATCH (CORBA::TIMEOUT, ex) + catch (const CORBA::TIMEOUT&) { - // A CORBA::TIMEOUT exception is expected since - // the server aborts itself - ACE_UNUSED_ARG (ex); ACE_DEBUG ((LM_DEBUG, "Client received an expected CORBA::TIMEOUT exception.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Client_Task - caught exception:"); + ex._tao_print_exception ("(%P|%t) Client_Task - caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp index 75b9645d96b..777dfd899cc 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -23,18 +23,17 @@ Reply_Handler::short_sleep (void) Test::AMI_HelloHandler_var current = _this(); - hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER); + hello_->sendc_short_sleep(current.in()); } void Reply_Handler::short_sleep_excep ( - ::Messaging::ExceptionHolder *ex - ACE_ENV_ARG_DECL) + ::Messaging::ExceptionHolder *ex) ACE_THROW_SPEC ((CORBA::SystemException)) { check_counter(); - ACE_TRY + try { if (ex) { @@ -48,20 +47,18 @@ Reply_Handler::short_sleep_excep ( ACE_ERROR ((LM_ERROR, "ERROR: Got nill exceptionholder\n")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Exceptions are expected and thus ignored in normal runs: #if 0 - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Reply_Handler - caught exception:"); + ex._tao_print_exception ("(%P|%t) Reply_Handler - caught exception:"); #endif /* 0 */ } - ACE_ENDTRY; Test::AMI_HelloHandler_var current = _this(); - hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER); + hello_->sendc_short_sleep(current.in()); } void Reply_Handler:: @@ -71,7 +68,7 @@ check_counter(void) if(count == 0) { // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n")); - orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown(0); return; } #if 0 diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 245e58a2bac..7ff901d9d20 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -20,8 +20,7 @@ public: void short_sleep (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL) + void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp index 103d6710fc7..5dca0e5ed97 100644 --- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp @@ -16,16 +16,14 @@ int Server_Task::svc (void) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index 32d46958498..cc005b58bb3 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -48,19 +48,19 @@ main (int argc, char *argv[]) { int retval = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -71,11 +71,10 @@ main (int argc, char *argv[]) } CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -111,17 +110,15 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - ACE_ENV_ARG_PARAMETER); + ); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 064749f5da1..21a50c21162 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -52,16 +52,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -81,7 +81,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -111,17 +111,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp index 4a637a9751c..d1a8e9ecdf1 100644 --- a/TAO/tests/Bug_1568_Regression/client.cpp +++ b/TAO/tests/Bug_1568_Regression/client.cpp @@ -43,19 +43,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Baz::C_var cobject = - Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Baz::C::_narrow (object.in ()); if (CORBA::is_nil (cobject.in ())) { @@ -70,12 +70,11 @@ main (int argc, char *argv[]) cobject->op3 (); cobject->op4 (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index fad92bf3786..f14b9ce628d 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -28,20 +28,16 @@ public: Simple_C (CORBA::ORB_ptr orb); void op1 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op2 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op3 ( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op4 ( - Baz::AMH_CResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Baz::AMH_CResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -59,8 +55,7 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb) void Simple_C::op1( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op1(); @@ -68,8 +63,7 @@ Simple_C::op1( void Simple_C::op2( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op2(); @@ -77,8 +71,7 @@ Simple_C::op2( void Simple_C::op3( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op3(); @@ -86,8 +79,7 @@ Simple_C::op3( void Simple_C::op4( - Baz::AMH_CResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Baz::AMH_CResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op4(); @@ -126,16 +118,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -155,7 +147,7 @@ main (int argc, char *argv[]) simple_c_impl->_this (); CORBA::String_var ior = - orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (simple_c.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -173,17 +165,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp index ebaae788c4e..827c5554b26 100644 --- a/TAO/tests/Bug_1627_Regression/client.cpp +++ b/TAO/tests/Bug_1627_Regression/client.cpp @@ -39,19 +39,19 @@ int main (int argc, char *argv[]) { int result = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test_var server = - Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -68,11 +68,10 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { result =1; } - ACE_ENDTRY; return result; } diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 60e0f87f466..ff3a70b57ca 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -37,15 +37,14 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -53,7 +52,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -65,19 +64,18 @@ main (int argc, char *argv[]) - root_poa->activate_object ( &server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object ( &server_impl); CORBA::Object_var server = server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); adapter->bind("Name-with-hyphens", ior.in()); @@ -100,15 +98,13 @@ main (int argc, char *argv[]) orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "SERVER (%P): Caught exception:"); + ex._tao_print_exception ("SERVER (%P): Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp index a8790222fe4..137bf0bd9bb 100644 --- a/TAO/tests/Bug_1635_Regression/client.cpp +++ b/TAO/tests/Bug_1635_Regression/client.cpp @@ -6,20 +6,17 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "SERVER (%P): Caught exception:"); + ex._tao_print_exception ("SERVER (%P): Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp index 1c920c02d28..d731b3571f5 100644 --- a/TAO/tests/Bug_1636_Regression/client.cpp +++ b/TAO/tests/Bug_1636_Regression/client.cpp @@ -7,22 +7,18 @@ int main (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" /* the ORB name, it can be anything! */ - ACE_ENV_ARG_PARAMETER); + "" /* the ORB name, it can be anything! */); ACE_DEBUG ((LM_DEBUG,"Get reference to the DynAny Factory\n")); CORBA::Object_var obj = - orb->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var daf = - DynamicAny::DynAnyFactory::_narrow (obj.in() - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (obj.in()); UnionIecs::S_i_num s_num; s_num.type_num = UnionIecs::E_type_num_called_party_number; @@ -36,11 +32,9 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "calling from_any () and to_any () with non-empty union...\n")); DynamicAny::DynAny_var dynany1 = - daf->create_dyn_any_from_type_code (UnionIecs::_tc_S_num - ACE_ENV_ARG_PARAMETER); + daf->create_dyn_any_from_type_code (UnionIecs::_tc_S_num); - dynany1->from_any(MyAny1 - ACE_ENV_ARG_PARAMETER); + dynany1->from_any(MyAny1); CORBA::Any_var arg1 = dynany1->to_any (); @@ -54,11 +48,9 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "calling from_any () and to_any () with empty union...\n" )); DynamicAny::DynAny_var dynany2 = - daf-> create_dyn_any_from_type_code (UnionIecs::_tc_S_num - ACE_ENV_ARG_PARAMETER); + daf-> create_dyn_any_from_type_code (UnionIecs::_tc_S_num); - dynany2->from_any (MyAny2 - ACE_ENV_ARG_PARAMETER); + dynany2->from_any (MyAny2); CORBA::Any_var arg2 = dynany2->to_any(); @@ -68,13 +60,11 @@ int main (int argc, char* argv[]) // Finally destroy the ORB orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception - test failed:\n"); + ex._tao_print_exception ("Exception - test failed:\n"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp index 77deff63371..59b8bdb5210 100644 --- a/TAO/tests/Bug_1670_Regression/client.cpp +++ b/TAO/tests/Bug_1670_Regression/client.cpp @@ -43,19 +43,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Baz::C_var cobject = - Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Baz::C::_narrow (object.in ()); if (CORBA::is_nil (cobject.in ())) { @@ -79,7 +79,7 @@ main (int argc, char *argv[]) ACE_ASSERT(result == 4); Foo::Bar::B_var bobject = - Foo::Bar::B::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Foo::Bar::B::_narrow (object.in ()); if (CORBA::is_nil (bobject.in ())) { @@ -93,7 +93,7 @@ main (int argc, char *argv[]) ACE_ASSERT(result == 3); Foo::Bar::A_var aobject = - Foo::Bar::A::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Foo::Bar::A::_narrow (object.in ()); if (CORBA::is_nil (aobject.in ())) { @@ -110,12 +110,11 @@ main (int argc, char *argv[]) ACE_ASSERT(result == 2); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index 258ed248782..fe192420c7f 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -28,20 +28,16 @@ public: Simple_C (CORBA::ORB_ptr orb); void op1 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op2 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op3 ( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); void op4 ( - Baz::AMH_CResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Baz::AMH_CResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -59,38 +55,34 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb) void Simple_C::op1( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op1(1 ACE_ENV_ARG_PARAMETER); + _tao_rh->op1(1); } void Simple_C::op2( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op2(2 ACE_ENV_ARG_PARAMETER); + _tao_rh->op2(2); } void Simple_C::op3( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op3(3 ACE_ENV_ARG_PARAMETER); + _tao_rh->op3(3); } void Simple_C::op4( - Baz::AMH_CResponseHandler_ptr _tao_rh - ACE_ENV_ARG_DECL) + Baz::AMH_CResponseHandler_ptr _tao_rh) ACE_THROW_SPEC ((CORBA::SystemException)) { - _tao_rh->op4(4 ACE_ENV_ARG_PARAMETER); + _tao_rh->op4(4); } // **************************************************************** @@ -126,16 +118,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -155,7 +147,7 @@ main (int argc, char *argv[]) simple_c_impl->_this (); CORBA::String_var ior = - orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (simple_c.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -173,17 +165,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp index 829bab08c33..6e120fe9bbd 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.cpp +++ b/TAO/tests/Bug_1676_Regression/Hello.cpp @@ -21,8 +21,7 @@ Hello::get_string (void) ::Test::StringList * Hello::get_stringList ( - // ACE_ENV_SINGLE_ARG_DECL_NOT_USED - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + // ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -47,7 +46,6 @@ void Hello::get_stringList2 ( ::CORBA::Boolean initialize, ::Test::StringList_out osl - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -73,7 +71,6 @@ Hello::get_stringList2 ( void Hello::mod_stringList ( ::Test::StringList & iosl - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -94,5 +91,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h index fb9a433efcd..dc3314a876c 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.h +++ b/TAO/tests/Bug_1676_Regression/Hello.h @@ -18,7 +18,6 @@ public: // = The skeleton methods virtual ::Test::StringList * get_stringList ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -27,7 +26,6 @@ public: virtual void get_stringList2 ( ::CORBA::Boolean initialize, ::Test::StringList_out osl - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -35,7 +33,6 @@ public: virtual void mod_stringList ( ::Test::StringList & iosl - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp index 4652c1e2642..86cba9c8498 100644 --- a/TAO/tests/Bug_1676_Regression/client.cpp +++ b/TAO/tests/Bug_1676_Regression/client.cpp @@ -38,19 +38,19 @@ void get_stringList2(Test::Hello_var hello); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -100,13 +100,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } @@ -115,7 +113,7 @@ void get_stringList2(Test::Hello_var hello) { Test::StringList_var seq2; - ACE_TRY_NEW_ENV + try { // Shutdown the ORB and block until the shutdown is complete. hello->get_stringList2(false, seq2.out()); @@ -126,16 +124,14 @@ void get_stringList2(Test::Hello_var hello) the_string.in ())); } } - ACE_CATCH(CORBA::BAD_PARAM, ex) + catch (const CORBA::BAD_PARAM& ) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "get_stringList2"); + ex._tao_print_exception ("get_stringList2"); } - ACE_ENDTRY; return; diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp index 245c288e5c8..8c998950dd3 100644 --- a/TAO/tests/Bug_1676_Regression/server.cpp +++ b/TAO/tests/Bug_1676_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp index bb7a278ba2f..8baf5225fc2 100644 --- a/TAO/tests/Bug_1693_Test/client.cpp +++ b/TAO/tests/Bug_1693_Test/client.cpp @@ -11,23 +11,19 @@ ACE_RCSID (Codec, int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "my_orb" - ACE_ENV_ARG_PARAMETER); + "my_orb"); // Obtain a reference to the CodecFactory. CORBA::Object_var obj = - orb->resolve_initial_references ("CodecFactory" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("CodecFactory"); IOP::CodecFactory_var codec_factory = - IOP::CodecFactory::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + IOP::CodecFactory::_narrow (obj.in ()); // ---------------------------------------------------------- @@ -40,8 +36,7 @@ main (int argc, char *argv[]) // Obtain the CDR encapsulation Codec. IOP::Codec_var codec = - codec_factory->create_codec (encoding - ACE_ENV_ARG_PARAMETER); + codec_factory->create_codec (encoding); // ---------------------------------------------------------- { @@ -55,13 +50,11 @@ main (int argc, char *argv[]) tmp <<= l; encoded_data = - codec->encode_value (tmp - ACE_ENV_ARG_PARAMETER); + codec->encode_value (tmp); decoded_data = codec->decode_value (encoded_data.in (), - Foo::_tc_type_ulong - ACE_ENV_ARG_PARAMETER); + Foo::_tc_type_ulong); Foo::type_ulong check = 0; @@ -82,13 +75,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test passed \n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Bug_1693_Test test:"); + ex._tao_print_exception ("Bug_1693_Test test:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 6f79e221b55..327da7c9a13 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -25,15 +25,13 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->corb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->corb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,11 +57,10 @@ Client_Task::svc (void) corb_->orb_core()->use_global_collocation ())); CORBA::Object_var tmp = - this->corb_->string_to_object (input_ - ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test::EventNode_var evNode= - Test::EventNode::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::EventNode::_narrow(tmp.in ()); if (CORBA::is_nil (evNode.in ())) { @@ -75,17 +72,15 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n")); - evNode->registerHello( hello_servant.in() ACE_ENV_ARG_PARAMETER ); + evNode->registerHello( hello_servant.in() ); evNode->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp index 42ddb1532f7..1e5a14e3da8 100644 --- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp +++ b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp @@ -49,8 +49,7 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Keep a copy of the ORB options args @@ -66,8 +65,7 @@ main (int argc, char *argv[]) CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -90,8 +88,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc(), catc.get_TCHAR_argv(), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -114,10 +111,9 @@ main (int argc, char *argv[]) corb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp index 5e141502dae..ff95b9d3da6 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.cpp +++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp @@ -14,7 +14,7 @@ EventNode::EventNode (CORBA::ORB_ptr orb, { } -void EventNode::registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL ) +void EventNode::registerHello ( ::Test::Hello_ptr h ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -56,5 +56,5 @@ void EventNode::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h index 8cca1acd0c0..328da040c9e 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.h +++ b/TAO/tests/Bug_2084_Regression/EventNode.h @@ -20,7 +20,7 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual void registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL) + virtual void registerHello ( ::Test::Hello_ptr h) ACE_THROW_SPEC (( CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index fca984db1f5..ffc76400566 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -15,7 +15,7 @@ ACE_RCSID(Hello, Hello, "$Id$") } char * -Hello::get_string (::CORBA::Long caller_threadid ACE_ENV_ARG_DECL) +Hello::get_string (::CORBA::Long caller_threadid) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -64,5 +64,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h index 0d101e8f91e..6ea9baac96d 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.h +++ b/TAO/tests/Bug_2084_Regression/Hello.h @@ -20,7 +20,7 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string ( ::CORBA::Long caller_threadid ACE_ENV_ARG_DECL ) + virtual char * get_string ( ::CORBA::Long caller_threadid ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp index 60ec86dde6b..7c7706dedfe 100644 --- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp @@ -27,15 +27,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,8 +52,7 @@ Server_Task::svc (void) sorb_->orb_core()->use_global_collocation ())); CORBA::String_var ior = - this->sorb_->object_to_string (evNode.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (evNode.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -78,19 +75,17 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ex) { // Periodically we get a bad inv order on fast machines. // It's a false negative and is safe to ignore. ACE_UNUSED_ARG (ex); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp index a86453e161e..77c9aba64aa 100644 --- a/TAO/tests/Bug_2134_Regression/Hello.cpp +++ b/TAO/tests/Bug_2134_Regression/Hello.cpp @@ -24,11 +24,11 @@ int main(int argc, char* argv[]) int status = 0; CORBA::ORB_var orb = CORBA::ORB::_nil(); - ACE_TRY_NEW_ENV + try { // Initialize the ORB orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // create Hello object Test::Hello_impl hello_i; @@ -109,13 +109,11 @@ int main(int argc, char* argv[]) orb->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Error - test failed - exception caught:"); + ex._tao_print_exception ("Error - test failed - exception caught:"); status = 1; } - ACE_ENDTRY; return status; } diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp index ac2fea6eda8..509db6595fd 100644 --- a/TAO/tests/Bug_2174_Regression/client.cpp +++ b/TAO/tests/Bug_2174_Regression/client.cpp @@ -44,19 +44,19 @@ int result = 1; int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -79,20 +79,19 @@ int main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const CORBA::OBJECT_NOT_EXIST& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR: Exception caught:"); + ex._tao_print_exception ("ERROR: Exception caught:"); result = 4; } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { result = 5; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR: Exception caught:"); + ex._tao_print_exception ("ERROR: Exception caught:"); result = 6; } - ACE_ENDTRY; return result; } diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp index a41b92e88da..03628e958c6 100644 --- a/TAO/tests/Bug_2174_Regression/server.cpp +++ b/TAO/tests/Bug_2174_Regression/server.cpp @@ -43,16 +43,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,7 +60,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -71,7 +71,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); if (remove_object) { @@ -102,12 +102,10 @@ main (int argc, char *argv[]) orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index f3a30e0718c..8efe0fe94f0 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -14,8 +14,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) CORBA::Long Simple_Server_i::echo (CORBA::Long x, - CORBA::Long msecs - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long msecs) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000); @@ -33,5 +32,5 @@ Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h index 3a8aecfe32c..8a135bdd767 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.h +++ b/TAO/tests/Bug_2174_Regression/test_i.h @@ -32,8 +32,7 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, - CORBA::Long msecs - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long msecs) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 92d9f8df86d..d9a502753b9 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 17efd26d1c1..5f794550945 100644 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -68,13 +68,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 696c03be73a..72abe515c04 100644 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +72,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,17 +90,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp index 1a5a373af98..78f86cba94b 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.cpp +++ b/TAO/tests/Bug_2186_Regression/Hello.cpp @@ -22,24 +22,23 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void -Hello::request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL) +Hello::request_callback (Test::Hello_ptr call_me) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Making call back !!!\n")); - ACE_TRY + try { CORBA::String_var result = call_me->get_string (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception attempting to callback client obj ref: \n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "Exception attempting to callback client obj ref: \n"); + throw; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Call back succeeded !!!\n")); } diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h index 0d038b5f615..177070074eb 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.h +++ b/TAO/tests/Bug_2186_Regression/Hello.h @@ -23,7 +23,7 @@ public: virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL) + virtual void request_callback (Test::Hello_ptr call_me) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp index f32b9ba7a88..2b227d1e91d 100644 --- a/TAO/tests/Bug_2186_Regression/client.cpp +++ b/TAO/tests/Bug_2186_Regression/client.cpp @@ -40,19 +40,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +72,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,10 +87,10 @@ main (int argc, char *argv[]) poa_manager->activate (); CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); Test::Hello_var server = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -102,20 +102,18 @@ 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); + server->request_callback (hello.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Test (client) Succeeded !!!\n")); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_ERROR, "(%P|%t) - Test (client) Failed !!!\n")); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp index aa853887654..37675e91a42 100644 --- a/TAO/tests/Bug_2186_Regression/server.cpp +++ b/TAO/tests/Bug_2186_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp index 404368133c3..694317d73bd 100644 --- a/TAO/tests/Bug_2188_Regression/client.cpp +++ b/TAO/tests/Bug_2188_Regression/client.cpp @@ -39,17 +39,17 @@ main (int argc, char *argv[]) ServerAdmin_var saobj; CORBA::ORB_var orb; - ACE_TRY_NEW_ENV + try { - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); - saobj = ServerAdmin::_narrow (tmp.in() ACE_ENV_ARG_PARAMETER); + saobj = ServerAdmin::_narrow (tmp.in()); if (CORBA::is_nil (saobj.in ())) { @@ -64,17 +64,15 @@ main (int argc, char *argv[]) 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); + atobj->a_charArray (char_array); ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; saobj->shutdown(); diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp index 79c168441d4..542278071fe 100644 --- a/TAO/tests/Bug_2188_Regression/server.cpp +++ b/TAO/tests/Bug_2188_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,7 +79,7 @@ main (int argc, char *argv[]) servant->_this (); CORBA::String_var ior = - orb->object_to_string (saobj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (saobj.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -97,17 +97,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp index e410aa7df9b..9dbff915efb 100644 --- a/TAO/tests/Bug_2234_Regression/client.cpp +++ b/TAO/tests/Bug_2234_Regression/client.cpp @@ -12,18 +12,17 @@ main( int argc, char** argv) { - ACE_DECLARE_NEW_CORBA_ENV; CORBA::Boolean testFailed= 0; ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 (Interceptor arg list with var len out params)\n")); - ACE_TRY + try { CORBA::ORB_var - orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); + orb= CORBA::ORB_init( argc, argv, 0 ); CORBA::Object_var - object= orb->string_to_object( "file://server.ior" ACE_ENV_ARG_PARAMETER ); + object= orb->string_to_object( "file://server.ior" ); Test::Foo_var - foo= Test::Foo::_narrow( object.in() ACE_ENV_ARG_PARAMETER ); + foo= Test::Foo::_narrow( object.in() ); //----------------------------------------------------------------------- CORBA::Long @@ -32,7 +31,7 @@ main( cL= 3, rL= 0; ACE_DEBUG( (LM_INFO, ". Long() ") ); - rL= foo->TestLong( aL, bL, cL ACE_ENV_ARG_PARAMETER); + rL= foo->TestLong( aL, bL, cL); 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;} @@ -52,7 +51,7 @@ main( cS= CORBA::string_dup("3"), rS; ACE_DEBUG( (LM_INFO, ". String() ") ); - rS= foo->TestString( aS.in(), bS.out(), cS.inout() ACE_ENV_ARG_PARAMETER); + rS= foo->TestString( aS.in(), bS.out(), cS.inout()); 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;} @@ -74,7 +73,7 @@ main( aFS->val= 1; cFS->val= 3; ACE_DEBUG( (LM_INFO, ". MyNonVarStruct() ") ); - rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout() ACE_ENV_ARG_PARAMETER); + rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout()); 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;} @@ -96,7 +95,7 @@ main( aVS->val= CORBA::string_dup("1"); cVS->val= CORBA::string_dup("3"); ACE_DEBUG( (LM_INFO, ". MyVarStruct() ") ); - rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout() ACE_ENV_ARG_PARAMETER); + rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout()); 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;} @@ -118,7 +117,7 @@ main( aFU->valLong( static_cast<CORBA::Long>(1) ); 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); + rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout()); ACE_DEBUG( (LM_INFO, "a is ") ); if (static_cast<CORBA::Short>(1) != aFU->_d()) ACE_DEBUG( (LM_INFO, "?") ); @@ -160,7 +159,7 @@ main( aVU->valLong( static_cast<CORBA::Long>(1) ); 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); + rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout()); ACE_DEBUG( (LM_INFO, "a is ") ); if (static_cast<CORBA::Short>(1) != aVU->_d()) ACE_DEBUG( (LM_INFO, "?") ); @@ -204,7 +203,7 @@ main( cSL->length(1); 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); + rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout()); ACE_DEBUG( (LM_INFO, "a is ") ); if (1u != aSL->length()) ACE_DEBUG( (LM_INFO, "?") ); @@ -246,7 +245,7 @@ main( aA<<= static_cast<CORBA::Long>(1); cA<<= static_cast<CORBA::Long>(3); ACE_DEBUG( (LM_INFO, ". Any() ") ); - rA= foo->TestAny( aA.in(), bA.out(), cA.inout() ACE_ENV_ARG_PARAMETER); + rA= foo->TestAny( aA.in(), bA.out(), cA.inout()); CORBA::Boolean aB, bB, @@ -285,28 +284,27 @@ main( ACE_DEBUG( (LM_INFO, "OK\n") ); //----------------------------------------------------------------------- - foo->ShutdownServer( ACE_ENV_SINGLE_ARG_PARAMETER ); + foo->ShutdownServer( ); //----------------------------------------------------------------------- - orb->shutdown( true ACE_ENV_ARG_PARAMETER ); - orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER ); + orb->shutdown( true ); + orb->destroy( ); } - ACE_CATCH( CORBA::SystemException, ex ) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION( ex, "CORBA::SystemException: " ); + ex._tao_print_exception ("CORBA::SystemException: "); testFailed= 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "CORBA::Exception: " ); + ex._tao_print_exception ("CORBA::Exception: "); testFailed= 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n") ); testFailed= 1; } - ACE_ENDTRY; ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 ") ); if (testFailed) diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp index fae6e08c3ca..fd550b9b327 100644 --- a/TAO/tests/Bug_2234_Regression/server.cpp +++ b/TAO/tests/Bug_2234_Regression/server.cpp @@ -41,7 +41,7 @@ public: CORBA::Long a, CORBA::Long_out b, CORBA::Long &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException ) ) { ACE_DEBUG( (LM_INFO, ". in TestLong\n") ); @@ -68,7 +68,7 @@ public: const char *a, CORBA::String_out b, char *&c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestString\n") ); @@ -115,7 +115,7 @@ public: const Test::MyNonVarStruct &a, Test::MyNonVarStruct_out b, Test::MyNonVarStruct &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { Test::MyNonVarStruct @@ -153,7 +153,7 @@ public: const Test::MyVarStruct &a, Test::MyVarStruct_out b, Test::MyVarStruct &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC(( CORBA::SystemException )) { ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") ); @@ -217,7 +217,7 @@ public: const Test::MyNonVarUnion &a, Test::MyNonVarUnion_out b, Test::MyNonVarUnion &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { Test::MyNonVarUnion @@ -265,7 +265,7 @@ public: const Test::MyVarUnion &a, Test::MyVarUnion_out b, Test::MyVarUnion &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") ); @@ -315,7 +315,7 @@ public: const Test::MySeqOfLong &a, Test::MySeqOfLong_out b, Test::MySeqOfLong &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestSeqOfLong\n") ); @@ -366,7 +366,7 @@ public: const CORBA::Any &a, CORBA::Any_out b, CORBA::Any &c - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestAny\n") ); @@ -420,11 +420,11 @@ public: //----------------------------------------------------------- void ShutdownServer( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in ShutdownServer\n") ); - orb->shutdown(0 ACE_ENV_ARG_PARAMETER); + orb->shutdown(0); } }; @@ -434,20 +434,20 @@ public: class AnInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: - char *name( ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) + char *name( ) ACE_THROW_SPEC( (CORBA::SystemException) ) { return const_cast<char *>(""); } - void destroy( ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) + void destroy( ) ACE_THROW_SPEC( (CORBA::SystemException) ) { } void receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException, PortableInterceptor::ForwardRequest) ) { @@ -597,13 +597,13 @@ public: void receive_request( PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException, PortableInterceptor::ForwardRequest) ) { ACE_DEBUG( (LM_INFO, "AnInterceptor::receive_request\n") ); Dynamic::ParameterList - *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER ); + *pArgs= ri->arguments( ); display_arg_list( pArgs ); } @@ -614,23 +614,23 @@ public: // be premiturely deleted before being sent back to the client. void send_reply( PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, "AnInterceptor::send_reply\n") ); Dynamic::ParameterList - *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER ); + *pArgs= ri->arguments( ); display_arg_list( pArgs ); ACE_DEBUG( (LM_INFO, " result is an ") ); CORBA::Any - *pAny= ri->result( ACE_ENV_SINGLE_ARG_PARAMETER ); + *pAny= ri->result( ); display_any( CORBA::Any_var( pAny ).in() ); ACE_DEBUG( (LM_INFO, "\n") ); } void send_exception( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException, PortableInterceptor::ForwardRequest) ) { @@ -638,7 +638,7 @@ public: void send_other( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException, PortableInterceptor::ForwardRequest) ) { @@ -655,14 +655,14 @@ public: void pre_init( PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { } void post_init( PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_NOT_USED ) + ) ACE_THROW_SPEC( (CORBA::SystemException) ) { info->add_server_request_interceptor( interceptor_ ); @@ -674,7 +674,7 @@ private: int main( int argc, char *argv[] ) { - ACE_TRY_NEW_ENV + try { ACE_DEBUG( (LM_INFO, "Server start\n") ); AnInterceptor @@ -686,48 +686,47 @@ int main( int argc, char *argv[] ) initialiser= initialiser_p; PortableInterceptor::register_orb_initializer( initialiser.in() ); - orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); + orb= CORBA::ORB_init( argc, argv, 0 ); CORBA::Object_var - Object = orb->resolve_initial_references( "RootPOA" ACE_ENV_ARG_PARAMETER ); + Object = orb->resolve_initial_references( "RootPOA" ); PortableServer::POA_var rootPOA= - PortableServer::POA::_narrow( Object.in() ACE_ENV_ARG_PARAMETER ); + PortableServer::POA::_narrow( Object.in() ); PortableServer::POAManager_var - rootPOAMgr = rootPOA->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER ); + rootPOAMgr = rootPOA->the_POAManager( ); FooImpl phooey; PortableServer::ObjectId_var - phooeyId= rootPOA->activate_object( &phooey ACE_ENV_ARG_PARAMETER ); + phooeyId= rootPOA->activate_object( &phooey ); CORBA::Object_var - phooeyObj= rootPOA->id_to_reference( phooeyId.in() ACE_ENV_ARG_PARAMETER ); + phooeyObj= rootPOA->id_to_reference( phooeyId.in() ); CORBA::String_var - stringifiedObj= orb->object_to_string( phooeyObj.in() ACE_ENV_ARG_PARAMETER ); + stringifiedObj= orb->object_to_string( phooeyObj.in() ); ofstream file( "server.ior" ); file << stringifiedObj; file.close(); - rootPOAMgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER ); + rootPOAMgr->activate( ); - orb->run( 0 ACE_ENV_ARG_PARAMETER ); + orb->run( 0 ); - orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER ); + orb->destroy( ); } - ACE_CATCH( CORBA::SystemException, exception ) + catch (const CORBA::SystemException& exception) { - ACE_PRINT_EXCEPTION( exception, "CORBA::SystemException: " ); + exception._tao_print_exception ("CORBA::SystemException: "); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "CORBA::Exception: " ); + ex._tao_print_exception ("CORBA::Exception: "); return -1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG( (LM_ERROR, "Unexpected general exception.\n") ); return -1; } - ACE_ENDTRY; ACE_DEBUG( (LM_INFO, "Server stopped\n") ); return 0; diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp index da5c2832189..2ceb5662238 100644 --- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp +++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp @@ -4,7 +4,7 @@ #include "MyInterfaceImpl.h" -const char* +const char* MyInterfaceImpl::my_string = "a string"; MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb) @@ -12,7 +12,7 @@ MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb) { } CORBA::Boolean -MyInterfaceImpl::myMethod (const char* mystring ACE_ENV_ARG_DECL) +MyInterfaceImpl::myMethod (const char* mystring) ACE_THROW_SPEC ((CORBA::SystemException)) { return mystring == my_string; diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h index a7f76261396..4f460c9d3f3 100644 --- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h +++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h @@ -9,11 +9,11 @@ class MyInterfaceImpl { public: MyInterfaceImpl (CORBA::ORB_ptr orb); - + static const char* my_string; // = The skeleton methods - virtual CORBA::Boolean myMethod (const char* stringParam ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean myMethod (const char* stringParam) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp index 750710f613c..1f81988cb77 100644 --- a/TAO/tests/Bug_2289_Regression/client.cpp +++ b/TAO/tests/Bug_2289_Regression/client.cpp @@ -42,19 +42,19 @@ int main (int argc, char *argv[]) { int result = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -78,7 +78,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test_ref.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,13 +89,12 @@ main (int argc, char *argv[]) } poa_manager->activate (); - ACE_TRY_CHECK CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); MyInterface_var server = - MyInterface::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + MyInterface::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -106,7 +105,7 @@ main (int argc, char *argv[]) } - CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string ACE_ENV_ARG_PARAMETER); + CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string); if (temp) { @@ -122,13 +121,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return result; } diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp index 05a8c455543..c79e9ed5cc3 100644 --- a/TAO/tests/Bug_2289_Regression/server.cpp +++ b/TAO/tests/Bug_2289_Regression/server.cpp @@ -48,16 +48,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -81,7 +81,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test_ref.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,11 +94,10 @@ main (int argc, char *argv[]) poa_manager->activate (); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { @@ -106,24 +105,22 @@ main (int argc, char *argv[]) } else { - adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior ACE_ENV_ARG_PARAMETER); + adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior); } orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 6b72212aa3e..b6c06208174 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -32,8 +32,7 @@ class ST_AMH_Servant ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -124,8 +123,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) // void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) + Test::Timestamp send_time) ACE_THROW_SPEC ((CORBA::SystemException)) { printf("Recieved Timestamp # %d \n", calls_received); @@ -157,15 +155,14 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv) // ST_AMH_Server::~ST_AMH_Server () { - ACE_TRY_NEW_ENV + try { - this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } @@ -173,32 +170,30 @@ ST_AMH_Server::~ST_AMH_Server () // int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb) { - ACE_TRY_NEW_ENV + try { this->orb_ = CORBA::ORB::_duplicate(_orb.in ()); CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); - this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); poa_manager->activate (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -207,7 +202,7 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb) // void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { - ACE_TRY_NEW_ENV + try { Test::Roundtrip_var roundtrip = servant->_this(); @@ -215,19 +210,17 @@ void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) (void) this->write_ior_to_file(iorstr); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; } // ------------------------------------------------------------------------ // void ST_AMH_Server::run_event_loop () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value period (1, 0); while (1) @@ -239,9 +232,8 @@ void ST_AMH_Server::run_event_loop () return; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) {} - ACE_ENDTRY; } // ------------------------------------------------------------------------ diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp index 8b6858373f1..ee5dcf4c2a3 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.cpp +++ b/TAO/tests/Bug_2328_Regression/Hello.cpp @@ -22,5 +22,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h index f799df7f7eb..f93bc8ae434 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.h +++ b/TAO/tests/Bug_2328_Regression/Hello.h @@ -17,7 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (const char * A, const char * B, const char * C ACE_ENV_ARG_DECL) + virtual char * get_string (const char * A, const char * B, const char * C) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp index 8b4117f7883..23ee6799cbd 100644 --- a/TAO/tests/Bug_2328_Regression/client.cpp +++ b/TAO/tests/Bug_2328_Regression/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -62,7 +62,7 @@ main (int argc, char *argv[]) CORBA::String_var B = CORBA::string_dup ("kwc"); 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); + hello->get_string (A.in (), B.in (), C.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); @@ -71,13 +71,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp index 6936acb1b7f..24e55dfc3b7 100644 --- a/TAO/tests/Bug_2328_Regression/server.cpp +++ b/TAO/tests/Bug_2328_Regression/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +72,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,17 +90,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index 2ceb1eaf6c8..c4fd6e66f28 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -35,19 +35,18 @@ foo_i::destroy () { bool expected_exception_raised = false; - ACE_TRY + try { // This should case an BAD_INV_ORDER exception this->orb_->destroy (); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ex) { if ((ex.minor() & 0xFFFU) == 3) { expected_exception_raised = true; } } - ACE_ENDTRY; if (!expected_exception_raised) ACE_ERROR ((LM_ERROR, "ERROR: Caught incorrect exception\n")); diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index df96fb1565d..dbd4bb9cb20 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -17,7 +17,7 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); @@ -47,12 +47,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 7c1084b7be0..9bdb1e53f3c 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -135,7 +135,6 @@ Publisher_impl::~Publisher_impl() void subscribe ( ::Subscriber_ptr subscriber - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -144,7 +143,6 @@ void subscribe ( void Publisher_impl::subscribe( ::Subscriber_ptr subscriber - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -155,7 +153,6 @@ Publisher_impl::subscribe( void Publisher_impl::shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h index 43a62ae54ac..a33a436ded5 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.h +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h @@ -14,14 +14,12 @@ class Publisher_impl : public POA_Publisher virtual void subscribe ( ::Subscriber_ptr subscriber - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException )); virtual void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 8a8ba4c1a2c..668321e182a 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -18,7 +18,7 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); @@ -63,12 +63,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp index 61f25e23349..e6e6c49453a 100644 --- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp @@ -16,7 +16,6 @@ Subscriber_impl::~Subscriber_impl() void Subscriber_impl::onData ( ::CORBA::Double - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -29,7 +28,6 @@ Subscriber_impl::onData ( ::CORBA::Boolean Subscriber_impl::isAlive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h index 4b37f8f7529..99e9d1b7c71 100644 --- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h +++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h @@ -13,13 +13,11 @@ class Subscriber_impl : public POA_Subscriber virtual void onData ( ::CORBA::Double value - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException )); virtual ::CORBA::Boolean isAlive ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp index f6617bc55d9..5f7ad67d59d 100644 --- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp +++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp @@ -19,12 +19,12 @@ ChildServant::parentMethod () ACE_THROW_SPEC((CORBA::SystemException)) { // Just throw an exception - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } void ChildServant::shutdown () ACE_THROW_SPEC((CORBA::SystemException)) { - this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown(0); } diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index dd48cdffec1..4c8326a9d99 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -22,18 +22,17 @@ class Reply_Handler virtual void childMethod_excep (Messaging::ExceptionHolder * - excep_holder ACE_ENV_ARG_DECL_WITH_DEFAULTS) + excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { excep_holder->raise_exception (); } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: "); + ex._tao_print_exception ("Reply_Handler::childMethod_excep: "); } - ACE_ENDTRY; } virtual void @@ -47,24 +46,22 @@ class Reply_Handler } virtual void - parentMethod_excep (Messaging::ExceptionHolder * excep_holder - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + parentMethod_excep (Messaging::ExceptionHolder * excep_holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { ++parentMethod_excep_count; excep_holder->raise_exception (); } - ACE_CATCH (CORBA::INTERNAL, iex) + catch (const CORBA::INTERNAL& iex) { ACE_DEBUG ((LM_DEBUG, "Successfully received an Internal Excep*ion as expected.\n")); } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: "); + ex._tao_print_exception ("Reply_Handler::childMethod_excep: "); } - ACE_ENDTRY; } CORBA::ULong reply_count (void) { return parentMethod_count + parentMethod_excep_count; }; @@ -108,14 +105,13 @@ client_parse_args(int argc, char *argv[]) int main(int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; CORBA::ORB_var orb; - ACE_TRY + try { // Initialize the ORB. - orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init(argc, argv, 0); // Initialize options based on command-line arguments. int parse_args_result = client_parse_args(argc, argv); @@ -125,10 +121,10 @@ main(int argc, char *argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get an object reference from the nominated file object = orb->string_to_object (server_ior); @@ -139,7 +135,7 @@ main(int argc, char *argv[]) poa_manager->activate(); - Child_var child = Child::_narrow (object.in() ACE_ENV_ARG_PARAMETER); + Child_var child = Child::_narrow (object.in()); Reply_Handler reply_handler_servant; @@ -147,8 +143,7 @@ main(int argc, char *argv[]) reply_handler_servant._this (); // Invoke the AMI parentMethod - child->sendc_parentMethod (reply_handler_object.in () - ACE_ENV_ARG_PARAMETER); + child->sendc_parentMethod (reply_handler_object.in ()); // Loop until all replies have been received. while (reply_handler_servant.reply_count () == 0) @@ -161,13 +156,11 @@ main(int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 8111a41efbb..5658bcbaed4 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -34,21 +34,18 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -62,8 +59,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) @@ -81,16 +77,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index 8a87e86c160..1c58c0f1449 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -128,8 +128,7 @@ main (int argc, char *argv[]) } catch (CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } diff --git a/TAO/tests/Bug_2503_Regression/common.cpp b/TAO/tests/Bug_2503_Regression/common.cpp index c295a6eb141..e534ce75e59 100644 --- a/TAO/tests/Bug_2503_Regression/common.cpp +++ b/TAO/tests/Bug_2503_Regression/common.cpp @@ -31,7 +31,7 @@ void report_exception() } catch(CORBA::Exception & ex) { - ACE_PRINT_EXCEPTION (ex, "CORBA Exception raised:"); + ex._tao_print_exception ("CORBA Exception raised:"); } catch(char const * msg) { diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp index 4b65039192c..326acec3275 100644 --- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp +++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp @@ -9,9 +9,8 @@ ACE_RCSID (Bug_2542_Regression, int main (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init(argc,argv); CORBA::Object_var object = @@ -30,17 +29,15 @@ int main (int argc, char* argv[]) CORBA::OctetSeq_var bin = codec->encode(any_o); CORBA::Any_var any_n = codec->decode(bin.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught a CORBA exception \n"); + ex._tao_print_exception ("Caught a CORBA exception \n"); return 1; } - ACE_CATCHALL + catch (...) { return 1; } - ACE_ENDTRY; 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 84ac537d2d7..c5610527539 100644 --- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp +++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp @@ -9,9 +9,8 @@ ACE_RCSID (Bug_2543_Regression, int main (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init(argc,argv); @@ -56,17 +55,15 @@ int main (int argc, char* argv[]) orb->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught a CORBA exception \n"); + ex._tao_print_exception ("Caught a CORBA exception \n"); return 1; } - ACE_CATCHALL + catch (...) { return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp index b1ad877149b..432759ef282 100644 --- a/TAO/tests/Bug_2560_Regression/server.cpp +++ b/TAO/tests/Bug_2560_Regression/server.cpp @@ -47,8 +47,8 @@ int main (int argc, char* argv[]) // Make policies for child POA CORBA::PolicyList policies(2) ; policies.length(2) ; - policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER ) ; - policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ACE_ENV_ARG_PARAMETER ) ; + policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ) ; + policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ) ; PortableServer::POA_var poa = root_poa->create_POA ( "MyPOA", poa_manager.in(), policies ); diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp index 65c22a9f8ed..3bb0a772b76 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.cpp +++ b/TAO/tests/Bug_2593_Regression/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp index e4569d3dcce..9f58a01ac0f 100644 --- a/TAO/tests/Bug_2593_Regression/client.cpp +++ b/TAO/tests/Bug_2593_Regression/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -68,13 +68,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp index 5ec046e3b26..d54cee175d5 100644 --- a/TAO/tests/Bug_2593_Regression/server.cpp +++ b/TAO/tests/Bug_2593_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp index be88215aac9..1891607cda1 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.cpp +++ b/TAO/tests/Bug_2595_Regression/Hello.cpp @@ -14,7 +14,6 @@ void Hello::op ( ::Test::Fls_out fstruct, ::Test::Vls_out vstruct - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -29,5 +28,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h index ead7d1ffced..3d09966e3fc 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.h +++ b/TAO/tests/Bug_2595_Regression/Hello.h @@ -19,7 +19,6 @@ public: virtual void op ( ::Test::Fls_out fstruct, ::Test::Vls_out vstruct - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp index d35b97353f6..00ffc6268de 100644 --- a/TAO/tests/Bug_2595_Regression/client.cpp +++ b/TAO/tests/Bug_2595_Regression/client.cpp @@ -38,19 +38,19 @@ void get_stringList2(Test::Hello_var hello); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -73,13 +73,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp index 245c288e5c8..8c998950dd3 100644 --- a/TAO/tests/Bug_2595_Regression/server.cpp +++ b/TAO/tests/Bug_2595_Regression/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp index da7f32dd4df..70c29c92ddc 100644 --- a/TAO/tests/Bug_2654_Regression/Hello.cpp +++ b/TAO/tests/Bug_2654_Regression/Hello.cpp @@ -31,8 +31,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } void -Hello::set_callback (Test::CallBack_ptr cb - ACE_ENV_ARG_DECL_NOT_USED) +Hello::set_callback (Test::CallBack_ptr cb) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n")); @@ -41,7 +40,7 @@ Hello::set_callback (Test::CallBack_ptr cb } void -Hello::method (CORBA::Short count ACE_ENV_ARG_DECL_NOT_USED) +Hello::method (CORBA::Short count) ACE_THROW_SPEC ((CORBA::SystemException)) { if (++this->count_ > 10) diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h index e6ab2e6e949..960867daf74 100644 --- a/TAO/tests/Bug_2654_Regression/Hello.h +++ b/TAO/tests/Bug_2654_Regression/Hello.h @@ -17,11 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void method (CORBA::Short count ACE_ENV_ARG_DECL) + virtual void method (CORBA::Short count) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void set_callback (Test::CallBack_ptr cb - ACE_ENV_ARG_DECL) + virtual void set_callback (Test::CallBack_ptr cb) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index 02b60d5e5cb..1def4e63883 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -136,7 +136,7 @@ int init_callback (Worker &w) { CORBA::Object_var obj = - w.orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + w.orb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,7 +144,7 @@ init_callback (Worker &w) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -157,8 +157,7 @@ init_callback (Worker &w) pol <<= BiDirPolicy::BOTH; policies[0] = w.orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -166,8 +165,7 @@ init_callback (Worker &w) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); Callback_i *servant = new Callback_i; diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp index 181736edcdc..baa8221e271 100644 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ b/TAO/tests/Bug_2654_Regression/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var obj = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -67,8 +67,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -76,8 +75,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -97,15 +95,15 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner(hello_impl); PortableServer::ObjectId_var id = - child_poa->activate_object(hello_impl ACE_ENV_ARG_PARAMETER); + child_poa->activate_object(hello_impl); - obj = child_poa->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER); + obj = child_poa->id_to_reference (id.in()); Test::Hello_var hello = - Test::Hello::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow (obj.in()); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -123,17 +121,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index 8729c0f9eb5..2bab685d7f8 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -52,9 +52,8 @@ main (int argc, char *argv[]) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); @@ -142,13 +141,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return result; } diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp index 7605ec1bec5..c326d7de11f 100644 --- a/TAO/tests/Bug_2702_Regression/client.cpp +++ b/TAO/tests/Bug_2702_Regression/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -64,13 +64,11 @@ main (int argc, char *argv[]) orb->run(duration); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index e7afef42fbc..1fc2260bb62 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -214,12 +214,11 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); ACE_Get_Opt get_opt (argc, argv, "dn:l:"); int opt; @@ -275,12 +274,11 @@ main (int argc, char *argv[]) } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Basic_Types"); + ex._tao_print_exception ("Basic_Types"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index de850a80895..41cc6e8963a 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -36,12 +36,11 @@ ACE_RCSID (CDR, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); static const CORBA::TypeCode_ptr tcs[]= { @@ -155,12 +154,11 @@ main (int argc, char *argv[]) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TC"); + ex._tao_print_exception ("TC"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp index f88a5184977..f994d2d27e3 100644 --- a/TAO/tests/COIOP/COIOP_Test.cpp +++ b/TAO/tests/COIOP/COIOP_Test.cpp @@ -50,15 +50,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -80,8 +78,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -105,10 +102,9 @@ main (int argc, char *argv[]) corb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp index b69065421e2..fe518deb52b 100644 --- a/TAO/tests/COIOP/Client_Task.cpp +++ b/TAO/tests/COIOP/Client_Task.cpp @@ -22,14 +22,13 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var tmp = - this->corb_->string_to_object (input_ - ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -53,7 +52,7 @@ Client_Task::svc (void) hello->shutdown (); } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { if (!this->result_) { @@ -63,16 +62,14 @@ Client_Task::svc (void) return 0; } - ACE_PRINT_EXCEPTION (ex, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp index 43a8b07fadc..d7339a7eb0b 100644 --- a/TAO/tests/COIOP/Hello.cpp +++ b/TAO/tests/COIOP/Hello.cpp @@ -66,5 +66,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp index b4c7f3a40c6..2eb03ea7e1f 100644 --- a/TAO/tests/COIOP/Server_Task.cpp +++ b/TAO/tests/COIOP/Server_Task.cpp @@ -26,15 +26,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +54,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -81,13 +78,11 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp index 4bbb75efe7f..fdd9836f70d 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp @@ -30,9 +30,9 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -58,9 +58,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -72,7 +72,7 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(this->orb_.in(), num_servants_); return 0; } @@ -82,8 +82,7 @@ void ClientApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); } @@ -92,11 +91,11 @@ ClientApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } } @@ -106,12 +105,10 @@ 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); + this->ior_.c_str()); this->servants_.create_and_activate(1, // number of callback servants - this->poa_.in() - ACE_ENV_ARG_PARAMETER); + this->poa_.in()); ServantListType::T_stub_var cb = this->servants_.objref(0); // Create the ClientEngine object, and give it the Foo_B and Callback object @@ -136,7 +133,7 @@ ClientApp::run_clients(void) { if (this->client_task_.open() != 0) { - ACE_THROW (TestAppException ()); + throw TestAppException (); } } @@ -151,13 +148,12 @@ ClientApp::run_orb_event_loop(void) PortableServer::POA_ptr -ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL) +ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -171,8 +167,7 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL) PortableServer::POA_var poa = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // 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 9447b7f619a..079c4a0e37c 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h @@ -21,13 +21,13 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void client_setup(void); @@ -50,8 +50,7 @@ class ClientApp : public TestAppBase int arg_dependency_checks(); PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Callback_i> ServantListType; diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index 3a8ec92aad6..4d4f7b2af52 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -32,9 +32,9 @@ ServerApp::~ServerApp() int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -60,9 +60,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -77,7 +77,7 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) unsigned num_clients = this->num_remote_clients_ + this->num_collocated_clients_; - TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(this->orb_.in(), num_clients); return 0; } @@ -87,14 +87,12 @@ void ServerApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); if (this->num_collocated_clients_ > 0) { this->cb_poa_ = this->create_poa(this->orb_.in(), - "CallbackPoa" - ACE_ENV_ARG_PARAMETER); + "CallbackPoa"); } } @@ -106,11 +104,11 @@ ServerApp::csd_setup(void) // We don't apply the strategy for this test to show that the bug isn't // part of the CSD ThreadPool Strategy code. #if 0 - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } #endif @@ -123,11 +121,11 @@ ServerApp::csd_setup(void) // We don't apply the strategy for this test to show that the bug isn't // part of the CSD ThreadPool Strategy code. #if 0 - if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to callback poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } #endif } @@ -140,8 +138,7 @@ 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); + this->ior_filename_prefix_.c_str()); } @@ -152,8 +149,7 @@ ServerApp::collocated_setup(void) return; this->cb_servants_.create_and_activate(1, // number of callback servants - this->cb_poa_.in() - ACE_ENV_ARG_PARAMETER); + this->cb_poa_.in()); CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0); @@ -190,7 +186,7 @@ ServerApp::run_collocated_clients(void) { if (this->collocated_client_task_.open() == -1) { - ACE_THROW (TestAppException ()); + throw TestAppException (); } } } @@ -343,14 +339,12 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL) + const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -364,8 +358,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, PortableServer::POA_var poa = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h index d976d13706e..549cc1bf290 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h @@ -21,13 +21,13 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void servant_setup(void); @@ -53,8 +53,7 @@ class ServerApp : public TestAppBase PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Foo_B_i> FooServantListType; typedef ServantList<Callback_i> CallbackServantListType; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp index 50f77346388..b3da6e294cc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp @@ -4,8 +4,7 @@ void AppHelper::ref_to_file(CORBA::ORB_ptr orb, CORBA::Object_ptr obj, - const char* filename - ACE_ENV_ARG_DECL) + const char* filename) { CORBA::String_var ior = orb->object_to_string(obj); @@ -16,7 +15,7 @@ AppHelper::ref_to_file(CORBA::ORB_ptr orb, ACE_ERROR((LM_ERROR, "(%P|%t) Cannot open output file [%s] to write IOR.\n", filename)); - ACE_THROW (TestAppException()); + throw TestAppException(); } ACE_OS::fprintf(ior_file, "%s", ior.in()); @@ -28,13 +27,11 @@ PortableServer::POA_ptr AppHelper::create_poa(const char* name, PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr mgr, - CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) + CORBA::PolicyList& policies) { PortableServer::POA_var child_poa = root_poa->create_POA(name, mgr, - policies - ACE_ENV_ARG_PARAMETER); + policies); if (CORBA::is_nil(child_poa.in())) { @@ -49,15 +46,14 @@ AppHelper::create_poa(const char* name, CORBA::Object_ptr AppHelper::activate_servant(PortableServer::POA_ptr poa, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) + PortableServer::Servant servant) { // Activate the servant using the Child POA. PortableServer::ObjectId_var oid - = poa->activate_object(servant ACE_ENV_ARG_PARAMETER); + = poa->activate_object(servant); CORBA::Object_var obj - = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER); + = poa->servant_to_reference(servant); if (CORBA::is_nil(obj.in())) { @@ -75,22 +71,19 @@ AppHelper::validate_connection (CORBA::Object_ptr obj) { for (CORBA::ULong j = 0; j != 100; ++j) { - ACE_TRY_NEW_ENV + try { #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::PolicyList_var unused; - obj->_validate_connection (unused - ACE_ENV_ARG_PARAMETER); + obj->_validate_connection (unused); #else - obj->_is_a ("Not_An_IDL_Type" - ACE_ENV_ARG_PARAMETER); + obj->_is_a ("Not_An_IDL_Type"); #endif /* TAO_HAS_MESSAGING == 1 */ return true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } return false; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index 7ba9b0320f5..70d58382e05 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -17,10 +17,9 @@ struct RefHelper typedef typename T::_var_type T_var; static T_ptr string_to_ref(CORBA::ORB_ptr orb, - const char* ior - ACE_ENV_ARG_DECL) + const char* ior) { - CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object(ior); if (CORBA::is_nil(obj.in())) { @@ -29,7 +28,7 @@ struct RefHelper ACE_THROW_RETURN (TestAppException(), T::_nil ()); } - T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + T_var t_obj = T::_narrow(obj.in()); if (CORBA::is_nil(t_obj.in())) { @@ -42,11 +41,10 @@ struct RefHelper } static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, - const char* name - ACE_ENV_ARG_DECL) + const char* name) { CORBA::Object_var obj - = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references(name); if (CORBA::is_nil(obj.in())) { @@ -56,7 +54,7 @@ struct RefHelper ACE_THROW_RETURN (TestAppException(), T::_nil ()); } - T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + T_var t_obj = T::_narrow(obj.in()); if (CORBA::is_nil(t_obj.in())) @@ -77,19 +75,16 @@ struct CSD_TP_Test_Export AppHelper static void ref_to_file(CORBA::ORB_ptr orb, CORBA::Object_ptr obj, - const char* filename - ACE_ENV_ARG_DECL); + const char* filename); static PortableServer::POA_ptr create_poa (const char* name, PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr mgr, - CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); + CORBA::PolicyList& policies); static CORBA::Object_ptr activate_servant(PortableServer::POA_ptr poa, - PortableServer::Servant servant - ACE_ENV_ARG_DECL); + PortableServer::Servant servant); // This helper method is used because there is a chance that the // initial CORBA request made to the target ORB will fail during diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp index 53dec90290a..c290dc54c5b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp @@ -17,17 +17,16 @@ AppShutdown::~AppShutdown() } -void -AppShutdown::init(CORBA::ORB_ptr orb, - unsigned num_clients - ACE_ENV_ARG_DECL) +void +AppShutdown::init(CORBA::ORB_ptr orb, + unsigned num_clients) { if ((!CORBA::is_nil(this->orb_.in())) || (CORBA::is_nil(orb)) || - (num_clients == 0)) + (num_clients == 0)) { // Already init()'ed, or bad argument values. - ACE_THROW(TestAppException()); + throw TestAppException(); } else { @@ -77,7 +76,7 @@ AppShutdown::client_done() } -AppShutdown* +AppShutdown* AppShutdown::instance () { static AppShutdown app_shutdown; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h index d79c2aababf..f3bc9706e2c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h @@ -13,12 +13,11 @@ class CSD_TP_Test_Export AppShutdown AppShutdown(); virtual ~AppShutdown(); - void init(CORBA::ORB_ptr orb, - unsigned num_clients - ACE_ENV_ARG_DECL); + void init(CORBA::ORB_ptr orb, + unsigned num_clients); void wait (); - + void client_done(); static AppShutdown* instance (); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp index 82b8f9d0d4d..388a559c8c1 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp @@ -63,7 +63,7 @@ ClientTask::svc() this->engines_.pop_back(); } - ACE_TRY_NEW_ENV + try { bool exec_ret = engine->execute(); if (exec_ret == false) @@ -72,15 +72,15 @@ ClientTask::svc() this->failure_count_ ++; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ClientTask::svc Caught exception from execute():"); + ex._tao_print_exception ( + "ClientTask::svc Caught exception from execute():"); GuardType guard(this->lock_); this->failure_count_ ++; } - ACE_CATCHALL + catch (...) { ACE_ERROR((LM_ERROR, "(%P|%t) ClientTask::svc caught unknown (...) exception "\ @@ -88,7 +88,6 @@ ClientTask::svc() GuardType guard(this->lock_); this->failure_count_ ++; } - ACE_ENDTRY; if(this->shutdown_after_done_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp index 1ac399990c7..812495cc732 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp @@ -42,7 +42,7 @@ OrbRunner::run(void) { ACE_ERROR((LM_ERROR, "(%P|%t) Failed to open the OrbTask.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } // This will use the current (mainline) thread to run the ORB event loop. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp index 632ea664649..c64221af9cc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp @@ -51,17 +51,16 @@ OrbShutdownTask::open(void*) int OrbShutdownTask::svc() { - ACE_TRY_NEW_ENV + try { - this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown(0); } - ACE_CATCHALL + catch (...) { ACE_ERROR((LM_ERROR, "(%P|%t) Exception raised by ORB::shutdown() call " "in OrbShutdownTask::svc().\n")); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp index 0610310ce91..a9861cf062a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp @@ -75,17 +75,16 @@ OrbTask::open(void*) int OrbTask::svc() { - ACE_TRY_NEW_ENV + try { this->orb_->run(); } - ACE_CATCHALL + catch (...) { ACE_ERROR((LM_ERROR, "(%P|%t) Exception raised by ORB::run() method. " "OrbTask is stopping.\n")); } - ACE_ENDTRY; return 0; } 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 8c06ff82ee9..5eeabeb2536 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp @@ -21,8 +21,7 @@ void ServantList<T>::create_and_activate(unsigned num_servants, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - const char* ior_fname_prefix - ACE_ENV_ARG_DECL) + const char* ior_fname_prefix) { for (unsigned i = 0; i < num_servants; i++) { @@ -35,16 +34,15 @@ ServantList<T>::create_and_activate(unsigned num_servants, CORBA::Object_var obj = AppHelper::activate_servant(poa, - record.safe_servant_.in() - ACE_ENV_ARG_PARAMETER); + record.safe_servant_.in()); - AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); + AppHelper::ref_to_file(orb, obj.in(), filename.c_str()); - record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + record.obj_ = T_stub::_narrow(obj.in()); if (CORBA::is_nil(record.obj_.in())) { - ACE_THROW (TestAppException()); + throw TestAppException(); } this->servant_records_.push_back(record); @@ -55,8 +53,7 @@ ServantList<T>::create_and_activate(unsigned num_servants, template <typename T> void ServantList<T>::create_and_activate(unsigned num_servants, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) { for (unsigned i = 0; i < num_servants; i++) { @@ -66,14 +63,13 @@ ServantList<T>::create_and_activate(unsigned num_servants, CORBA::Object_var obj = AppHelper::activate_servant(poa, - record.safe_servant_.in() - ACE_ENV_ARG_PARAMETER); + record.safe_servant_.in()); - record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + record.obj_ = T_stub::_narrow(obj.in()); if (CORBA::is_nil(record.obj_.in())) { - ACE_THROW (TestAppException()); + throw TestAppException(); } this->servant_records_.push_back(record); @@ -88,25 +84,22 @@ void ServantList<T>::deactivate(PortableServer::POA_ptr poa) { ServantRecord record; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableServer::ObjectId_var id = - poa->servant_to_id(record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); + poa->servant_to_id(record.safe_servant_.in()); - poa->deactivate_object(id.in() ACE_ENV_ARG_PARAMETER); + poa->deactivate_object(id.in()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ServantList_T::deactivate_servant ()"); + ex._tao_print_exception ("ServantList_T::deactivate_servant ()"); } - ACE_CATCHALL + catch (...) { ACE_ERROR((LM_ERROR, "(%P|%t)ServantList_T::deactivate_servant " "Caught unknown exception \n")); } - ACE_ENDTRY; } #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h index 3cc61e42905..8770b8f3ec9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h @@ -24,13 +24,11 @@ class ServantList void create_and_activate(unsigned num_servants, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - const char* ior_fname_prefix - ACE_ENV_ARG_DECL); + const char* ior_fname_prefix); /// Activate servant and not output ior to a file. void create_and_activate(unsigned num_servants, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL); + PortableServer::POA_ptr poa); // Code not used and not working right now - possible future addition. //void deactivate(PortableServer::POA_ptr poa); @@ -55,7 +53,7 @@ class ServantList ServantRecordVector servant_records_; }; - + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ServantList_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp index 118fab9b70f..8f264fbb111 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp @@ -20,9 +20,9 @@ TestAppBase::name() const int -TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL) +TestAppBase::run(int argc, char* argv[]) { - int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER); + int rc = this->run_i(argc, argv); // 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/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h index 5138ffbf84c..7ba1f36d23b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h @@ -15,7 +15,7 @@ class CSD_TP_Test_Export TestAppBase virtual ~TestAppBase(); // Returns 0 for success, and -1 for failure. - int run(int argc, char* argv[] ACE_ENV_ARG_DECL); + int run(int argc, char* argv[]); const char* name() const; @@ -25,7 +25,7 @@ class CSD_TP_Test_Export TestAppBase TestAppBase(const char* name); // Returns -1 for failure, 0 for success - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) = 0; + virtual int run_i(int argc, char* argv[]) = 0; private: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h index 5003c93e296..6daf932438e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h @@ -24,24 +24,22 @@ main(int argc, char* argv[]) \ \ APP_TYPE app; \ \ - ACE_TRY_NEW_ENV \ + try\ { \ - int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \ + int ret = app.run(argc,argv); \ \ return ret; \ } \ - ACE_CATCHANY \ + catch (const CORBA::Exception& ex)\ { \ - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, \ - "Caught exception:"); \ + ex._tao_print_exception ("Caught exception:"); \ } \ - ACE_CATCHALL \ + catch (...)\ { \ ACE_ERROR((LM_ERROR, \ "(%P|%t) Unknown (...) exception caught in main() " \ "for App [%d].\n", app.name())); \ } \ - ACE_ENDTRY; \ \ return 1; \ } 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 68b29729797..94e0a9d13d8 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 @@ -39,9 +39,9 @@ Foo_A_ClientEngine::execute(void) this->obj_->op1(); - this->obj_->op2(i ACE_ENV_ARG_PARAMETER); + this->obj_->op2(i); - CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER); + CORBA::Long value = this->obj_->op3(i); if (value != i) { @@ -50,21 +50,20 @@ Foo_A_ClientEngine::execute(void) for (CORBA::Long j = 1; j <= 5; j++) { - this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); + this->obj_->op4(495 + (i * 5) + j); } bool caught_exception = false; - ACE_TRY + try { this->obj_->op5(); } - ACE_CATCH (FooException, ex) + catch (const FooException& ) { // Expected caught_exception = true; } - ACE_ENDTRY; if (! caught_exception) { 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 199d3b8755f..1c0399091fd 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 @@ -26,7 +26,7 @@ Foo_A_i::op1(void) void -Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_A_i::op2(CORBA::Long value) 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_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_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); @@ -58,7 +58,7 @@ Foo_A_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; - ACE_THROW (FooException()); + throw FooException(); } 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 a43b1ffbc00..b55ee063666 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 @@ -17,13 +17,13 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op2(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long op3(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op4(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op5(void) 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 1081dbec722..f857655fb0c 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 @@ -43,9 +43,9 @@ Foo_B_ClientEngine::execute(void) this->obj_->op1(); - this->obj_->op2(this->client_id_ ACE_ENV_ARG_PARAMETER); + this->obj_->op2(this->client_id_); - CORBA::Long value = this->obj_->op3(this->client_id_ ACE_ENV_ARG_PARAMETER); + CORBA::Long value = this->obj_->op3(this->client_id_); if (value != static_cast<CORBA::Long>(this->client_id_)) { @@ -54,21 +54,20 @@ Foo_B_ClientEngine::execute(void) for (CORBA::ULong j = 1; j <= 5; j++) { - this->obj_->op4(495 + (this->client_id_ * 5) + j ACE_ENV_ARG_PARAMETER); + this->obj_->op4(495 + (this->client_id_ * 5) + j); } bool caught_exception = false; - ACE_TRY + try { this->obj_->op5(); } - ACE_CATCH (FooException, ex) + catch (const FooException& ) { // Expected caught_exception = true; } - ACE_ENDTRY; if (! caught_exception) { @@ -88,7 +87,7 @@ Foo_B_ClientEngine::execute(void) // Two-Way calls with "inout" and fixed size "in" arguments. CORBA::String_var message = CORBA::string_dup(test_str); - CORBA::Boolean result = this->obj_->op6( t, message.inout() ACE_ENV_ARG_PARAMETER); + CORBA::Boolean result = this->obj_->op6( t, message.inout()); ACE_UNUSED_ARG(result); @@ -101,14 +100,14 @@ Foo_B_ClientEngine::execute(void) } // Callback test. - this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER); + this->obj_->op7 (this->callback_.in ()); // 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); + this->obj_->test_unbounded_string_arg (ub_string.in ()); CORBA::String_var bd_string = CORBA::string_dup( test_str ); - this->obj_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER); + this->obj_->test_bounded_string_arg (bd_string.in ()); Fixed_Array fixed_array; @@ -117,7 +116,7 @@ Foo_B_ClientEngine::execute(void) fixed_array[m] = this->client_id_ + m; } - this->obj_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER); + this->obj_->test_fixed_array_arg (fixed_array); Var_Array var_array; @@ -128,29 +127,26 @@ Foo_B_ClientEngine::execute(void) var_array[k] = CORBA::string_dup(buffer); } - this->obj_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER); + this->obj_->test_var_array_arg (var_array); Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size(); bd_var_size_string->replace (ACE_OS::strlen (test_str) + 1, test_str); - this->obj_->test_bounded_var_size_arg (bd_var_size_string.in () - ACE_ENV_ARG_PARAMETER); + this->obj_->test_bounded_var_size_arg (bd_var_size_string.in ()); Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100); ub_var_size_string->replace (ub_var_size_string->maximum (), ACE_OS::strlen (test_str) + 1, test_str); - this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in () - ACE_ENV_ARG_PARAMETER); + this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in ()); - this->obj_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER); + this->obj_->test_fixed_size_arg (t); this->obj_->test_special_basic_arg (this->client_id_ % 2, - this->client_id_ - ACE_ENV_ARG_PARAMETER); + this->client_id_); - this->obj_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER); + this->obj_->test_objref_arg (this->callback_.in ()); // Sleep for 5 seconds before invoking done(). // This is a workaround with the problem that some oneway requests lost 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 01cf15a6596..e6075f9cec6 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 @@ -42,7 +42,7 @@ Foo_B_SimpleClientEngine::execute(void) bool check_validity = true; // Callback test. - ACE_TRY + try { if (CORBA::is_nil(this->callback_.in())) { @@ -50,15 +50,14 @@ Foo_B_SimpleClientEngine::execute(void) "The callback_ objref is nil before op7() call!\n")); } - this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER); + this->obj_->op7 (this->callback_.in ()); } - ACE_CATCH (FooException, ex) + catch (const FooException& ) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_SimpleClientEngine::execute " \ "FooException raised by op7() call.\n")); check_validity = false; } - ACE_ENDTRY; // Tell the servant that this client is done. this->obj_->done(); 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 3c13ac41ea8..0870febeb3c 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 @@ -30,7 +30,7 @@ Foo_B_i::op1(void) void -Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::op2(CORBA::Long value) 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_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_THROW_SPEC((CORBA::SystemException)) { this->op_count_[3] ++; @@ -62,14 +62,13 @@ Foo_B_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; - ACE_THROW (FooException()); + throw FooException(); } CORBA::Boolean Foo_B_i::op6(const TimeOfDay& t, - char*& message - ACE_ENV_ARG_DECL_NOT_USED) + char*& message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[5] ++; @@ -83,8 +82,7 @@ Foo_B_i::op6(const TimeOfDay& t, void -Foo_B_i::op7(Callback_ptr cb - ACE_ENV_ARG_DECL) +Foo_B_i::op7(Callback_ptr cb) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { @@ -95,7 +93,7 @@ Foo_B_i::op7(Callback_ptr cb error_count_ ++; ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::op7 nil callback error_count %u\n", error_count_)); - ACE_THROW (FooException ()); + throw FooException (); } else { @@ -105,8 +103,7 @@ Foo_B_i::op7(Callback_ptr cb void -Foo_B_i::test_unbounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_unbounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[7] ++; @@ -118,8 +115,7 @@ Foo_B_i::test_unbounded_string_arg(const char* message void -Foo_B_i::test_bounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_bounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[8] ++; @@ -131,8 +127,7 @@ Foo_B_i::test_bounded_string_arg(const char* message void -Foo_B_i::test_fixed_array_arg(const Fixed_Array message - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_fixed_array_arg(const Fixed_Array message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[9] ++; @@ -159,8 +154,7 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message void -Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[10] ++; @@ -172,8 +166,7 @@ Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message void -Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[11] ++; @@ -185,8 +178,7 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message void -Foo_B_i::test_fixed_size_arg(const TimeOfDay& t - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_fixed_size_arg(const TimeOfDay& t) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(t); @@ -199,8 +191,7 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t void -Foo_B_i::test_var_array_arg(const Var_Array messages - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_var_array_arg(const Var_Array messages) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[13] ++; @@ -244,8 +235,7 @@ Foo_B_i::test_var_array_arg(const Var_Array messages void Foo_B_i::test_special_basic_arg(CORBA::Boolean value, - CORBA::Long client_id - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long client_id) ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[14] ++; @@ -264,8 +254,7 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value, void -Foo_B_i::test_objref_arg(Callback_ptr cb - ACE_ENV_ARG_DECL_NOT_USED) +Foo_B_i::test_objref_arg(Callback_ptr cb) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(cb); 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 81ab536dbad..56d8109ed78 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 @@ -17,63 +17,52 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op2(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long op3(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op4(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)); virtual CORBA::Boolean op6(const TimeOfDay& t, - char*& message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + char*& message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op7(Callback_ptr cb - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op7(Callback_ptr cb) ACE_THROW_SPEC((CORBA::SystemException, FooException)); - virtual void test_unbounded_string_arg(const char* message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_unbounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_bounded_string_arg(const char* message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_bounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_fixed_array_arg(const Fixed_Array message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_fixed_array_arg(const Fixed_Array message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_var_array_arg(const Var_Array messages - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_var_array_arg(const Var_Array messages) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_fixed_size_arg(const TimeOfDay& t - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_fixed_size_arg(const TimeOfDay& t) ACE_THROW_SPEC((CORBA::SystemException)); virtual void test_special_basic_arg(CORBA::Boolean value, - CORBA::Long client_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Long client_id) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void test_objref_arg(Callback_ptr cb - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void test_objref_arg(Callback_ptr cb) ACE_THROW_SPEC((CORBA::SystemException)); virtual void done(void) 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 219e27956c3..b84640b56e0 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 @@ -36,9 +36,9 @@ Foo_C_ClientEngine::execute(void) this->obj_->op1(); - this->obj_->op2(i ACE_ENV_ARG_PARAMETER); + this->obj_->op2(i); - CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER); + CORBA::Long value = this->obj_->op3(i); if (value != i) { @@ -47,21 +47,20 @@ Foo_C_ClientEngine::execute(void) for (CORBA::Long j = 1; j <= 5; j++) { - this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); + this->obj_->op4(495 + (i * 5) + j); } bool caught_exception = false; - ACE_TRY + try { this->obj_->op5(); } - ACE_CATCH (FooException, ex) + catch (const FooException& ) { // Expected caught_exception = true; } - ACE_ENDTRY; if (! caught_exception) { 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 a5761265950..4fddb7213bf 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 @@ -36,8 +36,8 @@ Foo_C_Custom_ClientEngine::execute(void) CORBA::Long i = this->client_id_; this->proxy_.op1(); - this->proxy_.op2(i ACE_ENV_ARG_PARAMETER); - CORBA::Long value = this->proxy_.op3(i ACE_ENV_ARG_PARAMETER); + this->proxy_.op2(i); + CORBA::Long value = this->proxy_.op3(i); if (value != i) { @@ -47,21 +47,19 @@ Foo_C_Custom_ClientEngine::execute(void) for (CORBA::Long j = 1; j <= 5; j++) { - this->proxy_.op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER); + this->proxy_.op4(495 + (i * 5) + j); } bool caught_exception = false; - ACE_TRY_EX (op5) + try { this->proxy_.op5(); - ACE_TRY_CHECK_EX (op5); } - ACE_CATCH (FooException, ex) + catch (const FooException& ) { // Expected caught_exception = true; } - ACE_ENDTRY; if (! caught_exception) { @@ -71,8 +69,8 @@ Foo_C_Custom_ClientEngine::execute(void) long cust_i = this->client_id_; this->proxy_.cust_op1(); - this->proxy_.cust_op2(cust_i ACE_ENV_ARG_PARAMETER); - long cust_value = this->proxy_.cust_op3(cust_i ACE_ENV_ARG_PARAMETER); + this->proxy_.cust_op2(cust_i); + long cust_value = this->proxy_.cust_op3(cust_i); if (cust_value != i) { @@ -81,22 +79,20 @@ Foo_C_Custom_ClientEngine::execute(void) for (long cust_j = 1; cust_j <= 5; cust_j++) { - this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j ACE_ENV_ARG_PARAMETER); + this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j); } caught_exception = false; - ACE_TRY_EX (cust_op5) + try { this->proxy_.cust_op5(); - ACE_TRY_CHECK_EX (cust_op5) } - ACE_CATCHANY //(CustomException, ex) + catch (const CORBA::Exception& ex)//(CustomException, ex) { // Expected caught_exception = true; } - ACE_ENDTRY; if (! caught_exception) { 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 d59859dabcc..acd49fa4665 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 @@ -18,14 +18,13 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -34,14 +33,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -60,24 +58,24 @@ Foo_C_Custom_Proxy::op1(void) void -Foo_C_Custom_Proxy::op2(CORBA::Long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::op2(CORBA::Long x) { - this->objref_->op2(x ACE_ENV_ARG_PARAMETER); + this->objref_->op2(x); } CORBA::Long -Foo_C_Custom_Proxy::op3(CORBA::Long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::op3(CORBA::Long x) { - CORBA::Long result = this->objref_->op3(x ACE_ENV_ARG_PARAMETER); + CORBA::Long result = this->objref_->op3(x); return result; } void -Foo_C_Custom_Proxy::op4(CORBA::Long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::op4(CORBA::Long x) { - this->objref_->op4(x ACE_ENV_ARG_PARAMETER); + this->objref_->op4(x); } @@ -99,33 +97,33 @@ void 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); + this->strategy_->custom_synch_request(op.in()); } void -Foo_C_Custom_Proxy::cust_op2(long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::cust_op2(long x) { 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); + this->strategy_->custom_synch_request(op.in()); } long -Foo_C_Custom_Proxy::cust_op3(long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::cust_op3(long x) { 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); + this->strategy_->custom_synch_request(op.in()); int ret = op->result(); return ret; } void -Foo_C_Custom_Proxy::cust_op4(long x ACE_ENV_ARG_DECL) +Foo_C_Custom_Proxy::cust_op4(long x) { 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); + this->strategy_->custom_asynch_request(op.in()); } @@ -133,6 +131,6 @@ void 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); + this->strategy_->custom_synch_request(op.in()); 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 95e08b34758..c5e19bd73e4 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 @@ -31,16 +31,16 @@ public: bool validate_connection (); 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 op2(CORBA::Long x); + CORBA::Long op3(CORBA::Long x); + void op4(CORBA::Long x); void op5(void); void done(void); 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_op2(long x); + long cust_op3(long x); + void cust_op4(long x); void cust_op5(void); private: 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 feaf7ea73ca..36734cadf2b 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 @@ -12,14 +12,13 @@ Foo_C_cust_op1::Foo_C_cust_op1(Foo_C_i* 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -28,14 +27,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -44,7 +42,7 @@ Foo_C_cust_op1::result(void) { if (this->cancelled_) { - ACE_THROW (CancelledException()); + throw CancelledException(); } } 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 854bfafbb1c..40ffbf190f9 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 @@ -13,14 +13,13 @@ Foo_C_cust_op2::Foo_C_cust_op2(Foo_C_i* servant, long arg) // 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 + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -29,14 +28,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -45,7 +43,7 @@ Foo_C_cust_op2::result(void) { if (this->cancelled_) { - ACE_THROW (CancelledException()); + throw CancelledException(); } } 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 ab73409239f..7c65455a471 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 @@ -14,14 +14,13 @@ Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg) // 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 + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -30,14 +29,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } 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 80a7e0ecf3e..f4acb9c02d8 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 @@ -11,14 +11,13 @@ Foo_C_cust_op4::Foo_C_cust_op4(Foo_C_i* servant, long arg) // 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 + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } Foo_C_cust_op4::~Foo_C_cust_op4() @@ -26,14 +25,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } 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 02bd2c69714..9a165fe984c 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 @@ -14,14 +14,13 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_add_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -30,14 +29,13 @@ 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 // raised from _add_ref, we just ignore the exception here. - ACE_TRY_NEW_ENV + try { servant_->_remove_ref (); } - ACE_CATCHALL + catch (...) { } - ACE_ENDTRY; } @@ -46,12 +44,12 @@ Foo_C_cust_op5::result(void) { if (this->cancelled_) { - ACE_THROW (CancelledException()); + throw CancelledException(); } if (this->exception_) { - ACE_THROW (CustomException()); + throw CustomException(); } } @@ -59,15 +57,14 @@ Foo_C_cust_op5::result(void) void Foo_C_cust_op5::execute_i() { - ACE_TRY_NEW_ENV + try { this->servant_->cust_op5(); } - ACE_CATCH (CustomException, ex) + catch (const CustomException& ) { this->exception_ = true; } - ACE_ENDTRY; } 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 69c468daaf2..b15bee24580 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 @@ -27,7 +27,7 @@ Foo_C_i::op1(void) void -Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::op2(CORBA::Long value) 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_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_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); @@ -59,7 +59,7 @@ Foo_C_i::op5(void) ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ++this->count_[4]; - ACE_THROW (FooException()); + throw FooException(); } @@ -79,7 +79,7 @@ Foo_C_i::cust_op1(void) void -Foo_C_i::cust_op2(long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::cust_op2(long value) { this->in_values_[6].push_back (value); ++this->count_[6]; @@ -87,7 +87,7 @@ Foo_C_i::cust_op2(long value ACE_ENV_ARG_DECL_NOT_USED) long -Foo_C_i::cust_op3(long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::cust_op3(long value) { this->in_values_[7].push_back (value); ++this->count_[7]; @@ -96,7 +96,7 @@ Foo_C_i::cust_op3(long value ACE_ENV_ARG_DECL_NOT_USED) void -Foo_C_i::cust_op4(long value ACE_ENV_ARG_DECL_NOT_USED) +Foo_C_i::cust_op4(long value) { this->in_values_[8].push_back (value); ++this->count_[8]; @@ -107,7 +107,7 @@ void Foo_C_i::cust_op5(void) { ++this->count_[9]; - ACE_THROW (CustomException()); + 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 012a6a47bb3..d804d58ba00 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 @@ -17,13 +17,13 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C virtual void op1(void) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op2(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long op3(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void op4(CORBA::Long value) ACE_THROW_SPEC((CORBA::SystemException)); virtual void op5(void) @@ -34,9 +34,9 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C ACE_THROW_SPEC((CORBA::SystemException)); 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_op2(long value); + long cust_op3(long value); + void cust_op4(long value); 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 e58e46b0e80..53680a6cd93 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp @@ -19,10 +19,10 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { // Initialize the ORB before parsing our own args. - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -35,8 +35,7 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) } // Convert the IOR string to a Foo_A object reference. Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(), - this->ior_.c_str() - ACE_ENV_ARG_PARAMETER); + this->ior_.c_str()); // Create the appropriate client "engine" object. Foo_A_ClientEngine engine(foo.in()); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h index 1af2e9ff6a6..eade3cf3c53 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h @@ -15,7 +15,7 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: 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 a6a1208b0bd..5c4c0603584 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp @@ -24,10 +24,10 @@ ServerApp::~ServerApp() int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { // Initialize the ORB before parsing our own args. - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -39,13 +39,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(orb.in(), num_clients_); // Get the Root POA PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(), - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -60,8 +59,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) AppHelper::create_poa("ChildPoa", root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Create the thread pool servant dispatching strategy object, and @@ -70,7 +68,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) 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) + if (csd_strategy->apply_to(child_poa.in()) == false) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to child poa.\n")); @@ -86,14 +84,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) // Obtain the object reference using the servant CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(), - servant - ACE_ENV_ARG_PARAMETER); + servant); // 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); + this->ior_filename_.c_str()); // Activate the POA Manager poa_manager->activate(); @@ -118,7 +114,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the Root POA.\n")); - root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy(1, 1); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the ORB.\n")); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h index 3bfe10e6f0a..f86a60b5bf2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h @@ -16,7 +16,7 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: 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 fb1f32e6fe2..cd2c1607b6b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp @@ -21,9 +21,9 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -38,9 +38,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -55,8 +55,7 @@ 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); + this->ior_.c_str()); // Create the ClientEngine object, and give it the Foo_A obj ref. this->engine_ = new Foo_A_ClientEngine(foo.in(), this->client_id_); 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 6b359e96eb3..e49890697b6 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h @@ -17,12 +17,12 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void client_setup(void); int run_engine(void); void cleanup(); 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 89ab455005c..a889a00c118 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp @@ -30,9 +30,9 @@ ServerApp::~ServerApp() int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -58,9 +58,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -76,7 +76,7 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) unsigned num_clients = this->num_remote_clients_ + this->num_collocated_clients_; - TheAppShutdown->init (this->orb_.in (), num_clients ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init (this->orb_.in (), num_clients); return 0; } @@ -86,8 +86,7 @@ void ServerApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); } @@ -96,11 +95,11 @@ ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } } @@ -111,8 +110,7 @@ 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); + this->ior_filename_prefix_.c_str()); } @@ -149,7 +147,7 @@ ServerApp::run_collocated_clients(void) { if (this->collocated_client_task_.open() == -1) { - ACE_THROW (TestAppException ()); + throw TestAppException (); } } } @@ -302,14 +300,12 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL) + const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -323,8 +319,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, PortableServer::POA_var poa = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Give away the child POA_ptr from the POA_var variable. return poa._retn(); 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 91153fb1ffb..e08d7caec33 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h @@ -20,13 +20,13 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void servant_setup(void); @@ -52,8 +52,7 @@ class ServerApp : public TestAppBase PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Foo_A_i> ServantListType; 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 c07d9defed6..ef9a37a5987 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp @@ -29,9 +29,9 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -58,9 +58,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -72,7 +72,7 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(this->orb_.in(), num_servants_); return 0; } @@ -82,8 +82,7 @@ void ClientApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); } @@ -92,11 +91,11 @@ ClientApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } } @@ -106,12 +105,10 @@ 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); + this->ior_.c_str()); this->servants_.create_and_activate(1, // number of callback servants - this->poa_.in() - ACE_ENV_ARG_PARAMETER); + this->poa_.in()); ServantListType::T_stub_var cb = this->servants_.objref(0); // Create the ClientEngine object, and give it the Foo_B and Callback object @@ -149,14 +146,12 @@ ClientApp::run_orb_event_loop(void) PortableServer::POA_ptr ClientApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL) + const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -170,8 +165,7 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, PortableServer::POA_var poa = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // 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 417447aee99..f39500be7d4 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h @@ -21,13 +21,13 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void client_setup(void); @@ -50,8 +50,7 @@ class ClientApp : public TestAppBase int arg_dependency_checks(); PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Callback_i> ServantListType; 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 e00db2de579..17e721f012d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp @@ -32,9 +32,9 @@ ServerApp::~ServerApp() int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -72,9 +72,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -89,7 +89,7 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) unsigned num_clients = this->num_remote_clients_ + this->num_collocated_clients_; - TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(this->orb_.in(), num_clients); return 0; } @@ -99,14 +99,12 @@ void ServerApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); if (this->num_collocated_clients_ > 0) { this->cb_poa_ = this->create_poa(this->orb_.in(), - "CallbackPoa" - ACE_ENV_ARG_PARAMETER); + "CallbackPoa"); } } @@ -115,11 +113,11 @@ ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } // Use another poa and strategy for callbacks. This would resolve @@ -128,11 +126,11 @@ ServerApp::csd_setup(void) if (this->num_collocated_clients_ > 0) { this->cb_tp_strategy_ = new TAO::CSD::TP_Strategy(); - if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to callback poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } } } @@ -144,8 +142,7 @@ 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); + this->ior_filename_prefix_.c_str()); } @@ -156,8 +153,7 @@ ServerApp::collocated_setup(void) return; this->cb_servants_.create_and_activate(1, // number of callback servants - this->cb_poa_.in() - ACE_ENV_ARG_PARAMETER); + this->cb_poa_.in()); CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0); @@ -194,7 +190,7 @@ ServerApp::run_collocated_clients(void) { if (this->collocated_client_task_.open() == -1) { - ACE_THROW (TestAppException ()); + throw TestAppException (); } } } @@ -347,14 +343,12 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL) + const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -368,8 +362,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, PortableServer::POA_var poa = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // 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/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h index 20216f8fd52..aafbff9441d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h @@ -21,13 +21,13 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void servant_setup(void); @@ -53,8 +53,7 @@ class ServerApp : public TestAppBase PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Foo_B_i> FooServantListType; typedef ServantList<Callback_i> CallbackServantListType; 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 512c34c50f2..b05afba0e29 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp @@ -21,9 +21,9 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -40,9 +40,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -57,8 +57,7 @@ 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); + this->ior_.c_str()); // Create the ClientEngine object, and give it the Foo_C obj ref. this->engine_ = new Foo_C_ClientEngine(foo.in(), this->client_id_); 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 2dbf7dd6d52..ef77a2f1c9c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h @@ -17,13 +17,13 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void client_setup(void); int run_engine(void); void cleanup(); 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 2841377eb6e..00e668c62bc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp @@ -32,9 +32,9 @@ ServerApp::~ServerApp() int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { - int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER); + int result = this->init(argc, argv); if (result != 0) { return result; @@ -60,9 +60,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) int -ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::init(int argc, char* argv[]) { - this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Raises -1 if problems are encountered. @@ -77,7 +77,7 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL) unsigned num_clients = this->num_remote_clients_ + this->num_collocated_clients_; - TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(this->orb_.in(), num_clients); return 0; } @@ -87,8 +87,7 @@ void ServerApp::poa_setup(void) { this->poa_ = this->create_poa(this->orb_.in(), - "ChildPoa" - ACE_ENV_ARG_PARAMETER); + "ChildPoa"); } @@ -97,11 +96,11 @@ ServerApp::csd_setup(void) { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); - if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER)) + if (!this->tp_strategy_->apply_to(this->poa_.in())) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to poa.\n")); - ACE_THROW(TestAppException()); + throw TestAppException(); } } @@ -112,8 +111,7 @@ 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); + this->ior_filename_prefix_.c_str()); } @@ -161,7 +159,7 @@ ServerApp::run_collocated_clients(void) { if (this->collocated_client_task_.open() == -1) { - ACE_THROW (TestAppException ()); + throw TestAppException (); } } } @@ -325,14 +323,12 @@ ServerApp::set_arg(unsigned& value, PortableServer::POA_ptr ServerApp::create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL) + const char* poa_name) { // Get the Root POA. PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -347,8 +343,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, = AppHelper::create_poa(poa_name, root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // 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 f39e160df29..4433a097a07 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h @@ -20,13 +20,13 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: // These are all called, in order, by the run_i() method. - int init(int argc, char* argv[] ACE_ENV_ARG_DECL); + int init(int argc, char* argv[]); void poa_setup(void); void csd_setup(void); void servant_setup(void); @@ -52,8 +52,7 @@ class ServerApp : public TestAppBase PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name - ACE_ENV_ARG_DECL); + const char* poa_name); typedef ServantList<Foo_C_i> ServantListType; 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 65c22a9f8ed..3bb0a772b76 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 e4569d3dcce..9f58a01ac0f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -68,13 +68,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } 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 3b118c15dc3..02ce72b434d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +72,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,20 +90,18 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); // Wait for all CSD task threads exit. ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } 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 433a19eb187..996275e4897 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp @@ -22,10 +22,10 @@ ClientApp::~ClientApp() int -ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ClientApp::run_i(int argc, char* argv[]) { // Initialize the ORB before parsing our own args. - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -38,8 +38,7 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) } // Convert the IOR string to a Foo_A object reference. Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(), - this->ior_.c_str() - ACE_ENV_ARG_PARAMETER); + this->ior_.c_str()); // Create the appropriate client "engine" object. Foo_A_ClientEngine engine(foo.in()); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h index 1af2e9ff6a6..eade3cf3c53 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h @@ -15,7 +15,7 @@ class ClientApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: 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 c4ceffd9f79..58ecddfcf36 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp @@ -22,10 +22,10 @@ ServerApp::~ServerApp() } int -ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) +ServerApp::run_i(int argc, char* argv[]) { // Initialize the ORB before parsing our own args. - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); // Parse the command-line args for this application. // * Returns -1 if problems are encountered. @@ -37,13 +37,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER); + TheAppShutdown->init(orb.in(), num_clients_); // Get the Root POA PortableServer::POA_var root_poa = RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(), - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); // Get the POAManager from the Root POA. PortableServer::POAManager_var poa_manager @@ -58,8 +57,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) AppHelper::create_poa("ChildPoa", root_poa.in(), poa_manager.in(), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Create the servant object. Foo_A_i* servant = new Foo_A_i(); @@ -70,14 +68,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) // Obtain the object reference using the servant CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(), - servant - ACE_ENV_ARG_PARAMETER); + servant); // 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); + this->ior_filename_.c_str()); // Activate the POA Manager poa_manager->activate(); @@ -102,7 +98,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the Root POA.\n")); - root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy(1, 1); ACE_DEBUG((LM_DEBUG, "(%P|%t) ServerApp is destroying the ORB.\n")); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h index 3bfe10e6f0a..f86a60b5bf2 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h @@ -16,7 +16,7 @@ class ServerApp : public TestAppBase protected: - virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL); + virtual int run_i(int argc, char* argv[]); private: diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index 55edd4c9318..309a24676b8 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -30,5 +30,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index 17b342d7946..375b3e676ff 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/client.cpp @@ -42,19 +42,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -77,13 +77,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index 98847fd73ea..1ffed9e75a4 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,17 +87,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp index 833974f7588..60c5e152398 100644 --- a/TAO/tests/CallbackTest/Callback.cpp +++ b/TAO/tests/CallbackTest/Callback.cpp @@ -11,7 +11,7 @@ Callback::Callback (CORBA::ORB_ptr orb) } CORBA::Boolean -Callback::are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_NOT_USED) +Callback::are_you_there (CORBA::String_out answer) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -37,5 +37,5 @@ Callback::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - shutdown!\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h index d98dc9313d3..cc0e453bcc1 100644 --- a/TAO/tests/CallbackTest/Callback.h +++ b/TAO/tests/CallbackTest/Callback.h @@ -17,7 +17,7 @@ public: Callback (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Boolean are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean are_you_there (CORBA::String_out answer) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void test_oneway (void) diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp index afc8568114d..191c432fbfa 100644 --- a/TAO/tests/CallbackTest/Service.cpp +++ b/TAO/tests/CallbackTest/Service.cpp @@ -22,15 +22,14 @@ Service::dump_results (void) } void -Service::run_test (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::run_test (Test::Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)) { int exceptions = - this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER); + this->call_are_you_there (callback); exceptions += - this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); + this->call_test_oneway (callback); if (exceptions != 0) { @@ -41,24 +40,22 @@ Service::run_test (Test::Callback_ptr callback /// Increment the number of tests completed this->test_count_++; - ACE_TRY + try { callback->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_ERROR, "(%P|%t) - Service, client shutdown FAILED\n")); } - ACE_ENDTRY; // shutdown ourselves - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } int -Service::call_are_you_there (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::call_are_you_there (Test::Callback_ptr callback) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n")); @@ -69,15 +66,14 @@ Service::call_are_you_there (Test::Callback_ptr callback { char* outstr; CORBA::String_out out_str (outstr); - ACE_TRY + try { - (void) callback->are_you_there (out_str ACE_ENV_ARG_PARAMETER); + (void) callback->are_you_there (out_str); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { exception_count++; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, answer = %s\n", outstr)); } @@ -85,8 +81,7 @@ Service::call_are_you_there (Test::Callback_ptr callback } int -Service::call_test_oneway (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::call_test_oneway (Test::Callback_ptr callback) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n")); @@ -95,15 +90,14 @@ Service::call_test_oneway (Test::Callback_ptr callback int exception_count = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { (void) callback->test_oneway (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { exception_count++; } - ACE_ENDTRY; } return exception_count; } diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h index f8773771eb4..a3b5f905c89 100644 --- a/TAO/tests/CallbackTest/Service.h +++ b/TAO/tests/CallbackTest/Service.h @@ -23,8 +23,7 @@ public: void dump_results (void); // = The skeleton methods - virtual void run_test (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) + virtual void run_test (Test::Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -32,16 +31,14 @@ private: /** * @return Number of exceptions raised */ - int call_are_you_there (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) + int call_are_you_there (Test::Callback_ptr callback) ACE_THROW_SPEC (()); /// Call the test_oneway method mutiple times. /** * @return Number of exceptions raised */ - int call_test_oneway (Test::Callback_ptr callback - ACE_ENV_ARG_DECL) + int call_test_oneway (Test::Callback_ptr callback) ACE_THROW_SPEC (()); private: diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index de331840625..35f36497bd8 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +60,9 @@ main (int argc, char *argv[]) // Make all oneways "reliable." { CORBA::Object_var manager_object = - orb->resolve_initial_references("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(manager_object.in() - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow(manager_object.in()); if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,12 +73,10 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length(1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); policy_manager->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); } @@ -89,10 +85,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Service_var service = - Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Service::_narrow(tmp.in ()); if (CORBA::is_nil (service.in ())) { @@ -116,24 +112,22 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting test\n")); - service->run_test (callback.in () ACE_ENV_ARG_PARAMETER); + service->run_test (callback.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - running ORB\n")); orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index 278bb19fecc..4017a6a9d42 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,11 +61,9 @@ main (int argc, char *argv[]) // Make all oneways "reliable." { CORBA::Object_var manager_object = - orb->resolve_initial_references("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(manager_object.in() - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow(manager_object.in()); if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -76,12 +74,10 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length(1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); policy_manager->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); } @@ -99,7 +95,7 @@ main (int argc, char *argv[]) service_impl->_this (); CORBA::String_var ior = - orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (service.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -119,17 +115,15 @@ main (int argc, char *argv[]) service_impl->dump_results (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index b96db57fb72..1628e3d48d5 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -24,11 +24,10 @@ int Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; int successful_calls = 0; - ACE_TRY + try { this->validate_connection (); @@ -47,13 +46,11 @@ Client_Task::svc (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); @@ -65,24 +62,23 @@ Client_Task::svc (void) void Client_Task::validate_connection (void) { - ACE_TRY + try { for (int i = 0; i != 100; ++i) { (void) this->process_factory_->noop (); } } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ) { // Ignore transient exceptions } - ACE_ENDTRY; } int Client_Task::one_iteration (void) { - ACE_TRY + try { Test::Process_var process = this->process_factory_->create_new_process (); @@ -93,17 +89,15 @@ Client_Task::one_iteration (void) return 1; } - ACE_CATCH(Test::Spawn_Failed, ignored) + catch (const Test::Spawn_Failed& ) { // Ignore this exception, it is usually caused by a transient // condition } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index 9b40b7287b9..9985fcfdfe0 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -22,5 +22,5 @@ void Process::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index 7e474c5fb29..017f40d6297 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -34,7 +34,7 @@ Process_Factory::create_new_process (void) startup_callback_impl->_this (); CORBA::String_var ior = - this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (startup_callback.in ()); const char* argv[3] = { "child", @@ -65,24 +65,23 @@ Process_Factory::create_new_process (void) for (int i = 0; i != 500 && !process_has_started; ++i) { ACE_Time_Value interval (0, 10000); - this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER); + this->orb_->perform_work (interval); process_has_started = startup_callback_impl->process_has_started (the_process.out ()); } - ACE_TRY + try { PortableServer::POA_var poa = startup_callback_impl->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (startup_callback_impl); + poa->deactivate_object (id.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (process_has_started == 0) { @@ -107,5 +106,5 @@ Process_Factory::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown_received_ = 1; - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp index 5fc1eaba932..b31ad7c5078 100644 --- a/TAO/tests/Client_Leaks/Server_Task.cpp +++ b/TAO/tests/Client_Leaks/Server_Task.cpp @@ -17,18 +17,16 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // run the test for at most 120 seconds... // ACE_Time_Value tv (120, 0); - this->orb_->run ( /* tv, */ ACE_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run ( /* tv, */); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp index df4d755a97f..ea0b6043c97 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.cpp +++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp @@ -22,8 +22,7 @@ Startup_Callback::process_has_started (Test::Process_out the_process) } void -Startup_Callback::started (Test::Process_ptr process - ACE_ENV_ARG_DECL_NOT_USED) +Startup_Callback::started (Test::Process_ptr process) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h index 34e3d8e7412..e8207cc846e 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.h +++ b/TAO/tests/Client_Leaks/Startup_Callback.h @@ -24,8 +24,7 @@ public: int process_has_started (Test::Process_out the_process); // = The skeleton methods - virtual void started (Test::Process_ptr the_process - ACE_ENV_ARG_DECL) + virtual void started (Test::Process_ptr the_process) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index 1306fce8821..4b8425315a0 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -8,10 +8,10 @@ ACE_RCSID(Client_Leaks, server, "$Id$") int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (argc < 2) { @@ -25,9 +25,9 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1]); Test::Startup_Callback_var startup_callback = - Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Startup_Callback::_narrow (object.in ()); if (CORBA::is_nil (startup_callback.in ())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -36,10 +36,10 @@ main (int argc, char *argv[]) } CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,22 +60,21 @@ main (int argc, char *argv[]) poa_manager->activate (); - startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER); + startup_callback->started (process.in ()); ACE_Time_Value tv (50, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Do not print error messages, they only make the test output // confusing. return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp index dd2188d33ff..b4f3cf3468b 100644 --- a/TAO/tests/Client_Leaks/client.cpp +++ b/TAO/tests/Client_Leaks/client.cpp @@ -48,19 +48,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Process_Factory_var process_factory = - Test::Process_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Process_Factory::_narrow(tmp.in ()); if (CORBA::is_nil (process_factory.in ())) { @@ -91,13 +91,11 @@ main (int argc, char *argv[]) "ERROR: no calls were successful\n")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index e2cdeaa4672..d8f43ee9cc9 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -36,16 +36,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,7 +68,7 @@ main (int argc, char *argv[]) process_factory_impl->_this (); CORBA::String_var ior = - orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (process.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,17 +94,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index 7f5067981a7..09f6e6e1cc3 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -55,13 +55,12 @@ int main (int argc, char *argv[]) char buf[1000]; int error_count = 0; - ACE_TRY_NEW_ENV + try { // Init the orb CORBA::ORB_var orb= CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Get IOR from command line (or file) if (argc != 2) @@ -75,12 +74,10 @@ int main (int argc, char *argv[]) // The first arg should be the IOR CORBA::Object_var object = - orb->string_to_object (buf - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (buf); // Get the server - simple_var server = simple::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + simple_var server = simple::_narrow (object.in ()); const char *bare_string = "Hello World"; @@ -93,8 +90,7 @@ int main (int argc, char *argv[]) CORBA::String_var reply = server->op1 (bare_string, inarg, - outarg.out () - ACE_ENV_ARG_PARAMETER); + outarg.out ()); const char *any_reply; outarg >>= any_reply; @@ -126,13 +122,11 @@ int main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return error_count; } diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index ce8d9809acf..00d26a6b55a 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -38,8 +38,7 @@ public: // implementation of corba interface char * op1 (const char * name, const CORBA::Any & inany, - CORBA::Any_out outany - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Any_out outany) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -59,8 +58,7 @@ public: return CORBA::string_dup (name); }; - ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1 - ACE_ENV_ARG_DECL_NOT_USED) + ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::wstring_dup (s1); @@ -69,7 +67,7 @@ public: void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); }; private: @@ -84,18 +82,16 @@ private: int main(int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Init the orb CORBA::ORB_var orb= CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Initialize POA CORBA::Object_var poa_object= - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Check POA if (CORBA::is_nil (poa_object.in ())) @@ -107,8 +103,7 @@ int main(int argc, char *argv[]) // Get the ROOT POA PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); // Get the POA manager PortableServer::POAManager_var poa_manager = @@ -124,8 +119,7 @@ int main(int argc, char *argv[]) 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); + CORBA::String_var ior = orb->object_to_string (server.in ()); FILE *output_file= ACE_OS::fopen ("server.ior", "w"); if (output_file == 0) @@ -142,17 +136,15 @@ int main(int argc, char *argv[]) // Wait for calls orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server:"); + ex._tao_print_exception ("Exception caught in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index bb4e1860336..3c2fff94d02 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -109,8 +109,7 @@ test_codec (IOP::Codec_ptr codec) // Start out with the encode() method, i.e. the one that // includes the TypeCode in the CDR encapsulation. - encoded_data = codec->encode (data - ACE_ENV_ARG_PARAMETER); + encoded_data = codec->encode (data); if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ()) % ACE_CDR::MAX_ALIGNMENT) == 0) @@ -118,8 +117,7 @@ test_codec (IOP::Codec_ptr codec) "\nData for decoding are already aligned " "on MAX_ALIGNMENT.\n\n")); // Extract the data from the octet sequence. - decoded_data = codec->decode (encoded_data.in () - ACE_ENV_ARG_PARAMETER); + decoded_data = codec->decode (encoded_data.in ()); if (!(decoded_data.in() >>= extracted_value)) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,8 +142,7 @@ test_codec (IOP::Codec_ptr codec) // Now use the encode_value() method, i.e. the one that does // *not* include the TypeCode in the CDR encapsulation. - encoded_data = codec->encode_value (data - ACE_ENV_ARG_PARAMETER); + encoded_data = codec->encode_value (data); if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ()) % ACE_CDR::MAX_ALIGNMENT) == 0) @@ -156,8 +153,7 @@ test_codec (IOP::Codec_ptr codec) // Extract the data from the octet sequence. decoded_data = codec->decode_value (encoded_data.in (), - Foo::_tc_Bar - ACE_ENV_ARG_PARAMETER); + Foo::_tc_Bar); if (!(decoded_data.in() >>= extracted_value)) ACE_ERROR_RETURN ((LM_ERROR, @@ -181,23 +177,19 @@ int main (int argc, char *argv[]) { int retval = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "my_orb" - ACE_ENV_ARG_PARAMETER); + "my_orb"); // Obtain a reference to the CodecFactory. CORBA::Object_var obj = - orb->resolve_initial_references ("CodecFactory" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("CodecFactory"); IOP::CodecFactory_var codec_factory = - IOP::CodecFactory::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + IOP::CodecFactory::_narrow (obj.in ()); // Set up a structure that contains information necessary to // create a GIOP 1.1 CDR encapsulation Codec. @@ -210,8 +202,7 @@ main (int argc, char *argv[]) // Obtain the CDR encapsulation Codec. IOP::Codec_var codec_1_2 = - codec_factory->create_codec_with_codesets (encoding_1_2 - ACE_ENV_ARG_PARAMETER); + codec_factory->create_codec_with_codesets (encoding_1_2); retval = test_codec (codec_1_2.in ()); @@ -226,18 +217,15 @@ main (int argc, char *argv[]) // Obtain the CDR encapsulation Codec. IOP::Codec_var codec = - codec_factory->create_codec (encoding - ACE_ENV_ARG_PARAMETER); + codec_factory->create_codec (encoding); retval = test_codec (codec.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Codec test:"); + ex._tao_print_exception ("Codec test:"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Codec test passed.\n")); diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp index a075b5c6965..81ebab0c792 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/Collocation.cpp @@ -7,21 +7,20 @@ ACE_RCSID(Collocation, main, "$Id$") int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { Collocation_Test coll_test; - coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); + coll_test.init (argc, argv); coll_test.run (); coll_test.shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught exception: "); + ex._tao_print_exception ("Uncaught exception: "); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index ce1cbb86569..0a9a1a942a7 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -23,15 +23,15 @@ Collocation_Test::Collocation_Test (void) void Collocation_Test::shutdown (void) { - this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1); this->orb_->destroy (); } int -Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) +Collocation_Test::init (int argc, char *argv[]) { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0); int result = this->parse_args (argc, argv); if (result != 0) @@ -39,11 +39,11 @@ 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); + this->orb_->resolve_initial_references ("RootPOA"); // Narrow the Object reference to a POA reference this->root_poa_ = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of RootPOA this->poa_manager_ = @@ -51,31 +51,25 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) // 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); + this->root_poa_->activate_object (&this->top_servant_); // // We only care about the most derived class here. // this->diamond_obj_ = this->diamond_servant_._this (); id = - this->root_poa_->activate_object (&this->diamond_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->diamond_servant_); // We only care about the most derived class here. - this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()); id = - this->root_poa_->activate_object (&this->left_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->left_servant_); id = - this->root_poa_->activate_object (&this->right_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->right_servant_); CORBA::String_var str = - this->orb_->object_to_string (this->diamond_obj_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (this->diamond_obj_.in ()); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", str.in())); @@ -96,16 +90,16 @@ int Collocation_Test::test_narrow (void) { Diamond::Top_var top = - Diamond::Top::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); + Diamond::Top::_narrow (this->diamond_obj_.in ()); Diamond::Left_var left = - Diamond::Left::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); + Diamond::Left::_narrow (this->diamond_obj_.in ()); Diamond::Right_var right = - Diamond::Right::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); + Diamond::Right::_narrow (this->diamond_obj_.in ()); Diamond::Buttom_var buttom = - Diamond::Buttom::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); + Diamond::Buttom::_narrow (this->diamond_obj_.in ()); CORBA::String_var str = top->shape (); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h index fa8a0f690bf..9e04f7c6a74 100644 --- a/TAO/tests/Collocation/Collocation_Tester.h +++ b/TAO/tests/Collocation/Collocation_Tester.h @@ -31,7 +31,7 @@ public: void shutdown (void); - int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED); + int init (int argc, char *argv[]); // Initializing the Collocation_Test object. int parse_args (int argc, char *argv[]); diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp index e5cafff6bc8..a88f7def836 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp @@ -17,81 +17,77 @@ Client_Task::Client_Task (const char *ior, void Client_Task::test_system_exception ( - Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL) + Test::Hello_ptr hello_ptr) { - ACE_TRY + try { hello_ptr->system_exception_test (); } - ACE_CATCH (CORBA::INTERNAL, ex) + catch (const CORBA::INTERNAL& ) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught internal exception as expected\n")); // ignore } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_system_exception:"); - ACE_RE_THROW; + ex._tao_print_exception ( + "Unexpected exception caught in test_system_exception:"); + throw; } - ACE_ENDTRY; } void Client_Task::test_user_exception_expected ( - Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL) + Test::Hello_ptr hello_ptr) { - ACE_TRY + try { hello_ptr->user_exception_expected (); } - ACE_CATCH (::Test::Hello::A, ex) + catch (const ::Test::Hello::A& ) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught user A exception as expected\n")); // ignore } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_user_exception_expected:"); - ACE_RE_THROW; + ex._tao_print_exception ( + "Unexpected exception caught in test_user_exception_expected:"); + throw; } - ACE_ENDTRY; } void Client_Task::test_user_exception_not_expected ( - Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL) + Test::Hello_ptr hello_ptr) { - ACE_TRY + try { hello_ptr->user_exception_not_expected (); } - ACE_CATCH (CORBA::UNKNOWN, ex) + catch (const CORBA::UNKNOWN& ) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught unknown exception as expected\n")); // ignore } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in user_exception_not_expected:"); - ACE_RE_THROW; + ex._tao_print_exception ( + "Unexpected exception caught in user_exception_not_expected:"); + throw; } - ACE_ENDTRY; } int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var tmp = - this->corb_->string_to_object (input_ - ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -107,21 +103,19 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - this->test_system_exception (hello.in () ACE_ENV_ARG_PARAMETER); + this->test_system_exception (hello.in ()); - this->test_user_exception_expected (hello.in () ACE_ENV_ARG_PARAMETER); + this->test_user_exception_expected (hello.in ()); - this->test_user_exception_not_expected (hello.in () ACE_ENV_ARG_PARAMETER); + this->test_user_exception_not_expected (hello.in ()); hello->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h index 7d675ac6143..33eb64be258 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.h +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h @@ -28,9 +28,9 @@ public: int svc (void); private: - void test_system_exception (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL); - void test_user_exception_expected (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL); - void test_user_exception_not_expected (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL); + void test_system_exception (Test::Hello_ptr hello_ptr); + void test_user_exception_expected (Test::Hello_ptr hello_ptr); + void test_user_exception_not_expected (Test::Hello_ptr hello_ptr); const char *input_; diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp index 500e72adc88..1213d69c276 100644 --- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -49,15 +49,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -79,8 +77,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -95,10 +92,9 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp index 2d01e524ae7..4d91591ca64 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.cpp +++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp @@ -18,14 +18,14 @@ void Hello::system_exception_test (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } void Hello::user_exception_expected (void) ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)) { - ACE_THROW (::Test::Hello::A ()); + throw ::Test::Hello::A (); } void @@ -38,7 +38,7 @@ Hello::user_exception_not_expected (void) void Hello::throw_internal_b (void) { - ACE_THROW (::Test::Hello::B ()); + throw ::Test::Hello::B (); } char * @@ -88,5 +88,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 8129e39ffc9..c6e578fa422 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -26,15 +26,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +54,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -80,17 +77,15 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index 16a2d78e815..a8ad8f92b03 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -24,14 +24,13 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var tmp = - this->corb_->string_to_object (input_ - ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -67,10 +66,10 @@ Client_Task::svc (void) CORBA::PolicyList polList; polList.length(1); polList[0] = this->corb_->create_policy( - Messaging::SYNC_SCOPE_POLICY_TYPE, anyPolicy ACE_ENV_ARG_PARAMETER); + Messaging::SYNC_SCOPE_POLICY_TYPE, anyPolicy); CORBA::Object_var tmpGenericVar = - tmpVar->_set_policy_overrides(polList,CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); + tmpVar->_set_policy_overrides(polList,CORBA::ADD_OVERRIDE); // do unchecked narrow because ORB's not activated. Otherwise get TRANSIENT exception hello = Test::Hello::_narrow(tmpGenericVar.in()); @@ -95,13 +94,11 @@ Client_Task::svc (void) hello->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp index b5f46a9d86d..97635628029 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp @@ -74,15 +74,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -104,8 +102,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -121,10 +118,9 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp index 7a212ffe621..8eb26a89ec3 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp @@ -71,5 +71,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index 8129e39ffc9..c6e578fa422 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -26,15 +26,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +54,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -80,17 +77,15 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 576ad700566..f18b2f4792a 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -14,8 +14,7 @@ class test_i : public: test_i (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL); + PortableServer::POA_ptr poa); void set_other (test_ptr test); @@ -34,20 +33,17 @@ public: }; test_i::test_i (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)) { CORBA::Object_var object; object = - this->orb_->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("POACurrent"); this->poa_current_ = - PortableServer::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (object.in ()); } void @@ -118,14 +114,13 @@ Task::Task (CORBA::ORB_ptr orb) int Task::svc (void) { - ACE_TRY_NEW_ENV + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } @@ -133,21 +128,18 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -165,19 +157,16 @@ main (int argc, char *argv[]) policies.length (1); policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); PortableServer::POA_var child_poa = root_poa->create_POA ("child_poa", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *base_servant = new test_i (orb.in (), - child_poa.in () - ACE_ENV_ARG_PARAMETER); + child_poa.in ()); PortableServer::ServantBase_var safe_base_servant (base_servant); @@ -185,16 +174,14 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("base"); child_poa->activate_object_with_id (base_oid.in (), - base_servant - ACE_ENV_ARG_PARAMETER); + base_servant); test_var base_test = base_servant->_this (); test_i *first_servant = new test_i (orb.in (), - child_poa.in () - ACE_ENV_ARG_PARAMETER); + child_poa.in ()); PortableServer::ServantBase_var safe_first_servant (first_servant); @@ -202,8 +189,7 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("first"); child_poa->activate_object_with_id (first_oid.in (), - first_servant - ACE_ENV_ARG_PARAMETER); + first_servant); test_var first_test = first_servant->_this (); @@ -217,23 +203,19 @@ main (int argc, char *argv[]) object = child_poa->create_reference_with_id (second_oid.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var second_test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test_i *second_servant = new test_i (orb.in (), - child_poa.in () - ACE_ENV_ARG_PARAMETER); + child_poa.in ()); PortableServer::ServantBase_var safe_second_servant (second_servant); child_poa->activate_object_with_id (second_oid.in (), - second_servant - ACE_ENV_ARG_PARAMETER); + second_servant); base_servant->set_other (second_test.in ()); @@ -244,51 +226,42 @@ main (int argc, char *argv[]) object = child_poa->create_reference_with_id (third_oid.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); CORBA::String_var third_ior = - orb->object_to_string (object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object.in ()); object = - orb->string_to_object (third_ior.in () - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (third_ior.in ()); test_var third_test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test_i *third_servant = new test_i (orb.in (), - child_poa.in () - ACE_ENV_ARG_PARAMETER); + child_poa.in ()); PortableServer::ServantBase_var safe_third_servant (third_servant); child_poa->activate_object_with_id (third_oid.in (), - third_servant - ACE_ENV_ARG_PARAMETER); + third_servant); base_servant->set_other (third_test.in ()); base_test->method (); - orb->shutdown (1 - ACE_ENV_ARG_PARAMETER); + orb->shutdown (1); result = task.wait (); ACE_ASSERT (result != -1); ACE_UNUSED_ARG (result); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp index f96eaf80861..aabba8b790e 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Tests/Client_Task.cpp @@ -20,14 +20,13 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var tmp = - this->corb_->string_to_object (input_ - ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -45,13 +44,11 @@ Client_Task::svc (void) hello->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp index 57f11732206..2dc79a2c99f 100644 --- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp @@ -47,15 +47,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -77,8 +75,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -101,10 +98,9 @@ main (int argc, char *argv[]) corb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp index 5db019621a9..fb956dded83 100644 --- a/TAO/tests/Collocation_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Tests/Hello.cpp @@ -65,5 +65,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp index 240d10c264e..47c69723633 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Tests/Server_Task.cpp @@ -26,15 +26,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,8 +54,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -80,13 +77,11 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp index ecbadf07435..db476f2a5a1 100644 --- a/TAO/tests/Compression/server.cpp +++ b/TAO/tests/Compression/server.cpp @@ -14,21 +14,20 @@ bool test_invalid_compression_factory (Compression::CompressionManager_ptr cm) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Get an invalid compression factory Compression::CompressorFactory_var factory = cm->get_factory (100); } - ACE_CATCH (Compression::UnknownCompressorId, ex) + catch (const Compression::UnknownCompressorId& ex) { ACE_UNUSED_ARG (ex); succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -46,20 +45,19 @@ test_duplicate_compression_factory ( Compression::CompressorFactory_ptr cf) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Register duplicate cm->register_factory (cf); } - ACE_CATCH (Compression::FactoryAlreadyRegistered, ex) + catch (const Compression::FactoryAlreadyRegistered& ex) { ACE_UNUSED_ARG (ex); succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -75,22 +73,21 @@ test_register_nil_compression_factory ( Compression::CompressionManager_ptr cm) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Register nil factory cm->register_factory (Compression::CompressorFactory::_nil()); } - ACE_CATCH (CORBA::BAD_PARAM, ex) + catch (const CORBA::BAD_PARAM& ex) { if ((ex.minor() & 0xFFFU) == 44) { succeed = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -106,10 +103,10 @@ int main (int argc, char *argv[]) { int retval = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var compression_manager = orb->resolve_initial_references("CompressionManager"); @@ -169,13 +166,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); retval = 1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp index 73b12934ac8..924779e1619 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.cpp +++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp @@ -22,5 +22,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp index a8649d9ab7d..1d974b34168 100644 --- a/TAO/tests/Connect_Strategy_Test/client.cpp +++ b/TAO/tests/Connect_Strategy_Test/client.cpp @@ -41,19 +41,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -76,13 +76,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index 020f4649f81..4f8227d7664 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp index c6b661375ea..92d78104359 100644 --- a/TAO/tests/Connection_Failure/client.cpp +++ b/TAO/tests/Connection_Failure/client.cpp @@ -15,25 +15,24 @@ const char *ior = int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var tmp = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); // First connection happens here.. - test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); + test::_narrow (tmp.in ()); } - ACE_CATCH (CORBA::TRANSIENT, transient_exception) + catch (const CORBA::TRANSIENT& ) { // This exception is correct. ACE_DEBUG ((LM_DEBUG, "_narrow() to non-existent object failed correctly. Test succeeded.\n")); return 0; } - ACE_ENDTRY; // Should not reach here. ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index 85a9a04835e..1762358939a 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -36,10 +36,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -58,10 +58,10 @@ main (int argc, char *argv[]) { iorfile = "file://" + iorfile; CORBA::Object_var tmp = - orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER); + orb->string_to_object(iorfile.c_str ()); test_var test = - test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -71,15 +71,13 @@ main (int argc, char *argv[]) 1); } - test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK + test->send_stuff ("Some stuff to send"); // Test for LFU strategy. The transport to any other // server should be removed before the first one. if (i == 0) { - test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK + test->send_stuff ("Some stuff to send"); holder = test; } @@ -89,8 +87,7 @@ main (int argc, char *argv[]) // removed. if (!CORBA::is_nil(holder.in ())) { - holder->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK + holder->send_stuff ("Some stuff to send"); } } } @@ -100,17 +97,15 @@ main (int argc, char *argv[]) } } - orb->shutdown (1 ACE_ENV_ARG_PARAMETER); + orb->shutdown (1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index 706a22d6029..2c3fffcf73a 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -35,16 +35,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -67,7 +67,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,17 +86,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); delete test_impl; - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp index 48b6bc7ccb1..de59e99593c 100644 --- a/TAO/tests/Connection_Purging/test_i.cpp +++ b/TAO/tests/Connection_Purging/test_i.cpp @@ -4,8 +4,7 @@ #include "test_i.h" void -test_i::send_stuff (const char* string - ACE_ENV_ARG_DECL_NOT_USED) +test_i::send_stuff (const char* string) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h index 2670a7a51d8..bebd408b2d0 100644 --- a/TAO/tests/Connection_Purging/test_i.h +++ b/TAO/tests/Connection_Purging/test_i.h @@ -13,8 +13,7 @@ class test_i { public: // = The skeleton methods - virtual void send_stuff (const char* string - ACE_ENV_ARG_DECL) + virtual void send_stuff (const char* string) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp index 8f2bc44fae1..7cc9937e21e 100644 --- a/TAO/tests/Connection_Timeout/client.cpp +++ b/TAO/tests/Connection_Timeout/client.cpp @@ -41,16 +41,16 @@ parse_args (int argc, char *argv[]) } int -test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) +test_timeout (CORBA::Object_ptr object) { // Start the timer profile_timer.start (); - ACE_TRY + try { // First connection happens here.. Test::Hello_var hello = - Test::Hello::_narrow(object ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(object); if (CORBA::is_nil (hello.in ())) { @@ -68,7 +68,7 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) hello->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Stop the timer profile_timer.stop (); @@ -93,7 +93,6 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) "(%P|%t) Success, timeout: %F \n", el.real_time)); } - ACE_ENDTRY; return 0; } @@ -103,23 +102,22 @@ main (int argc, char *argv[]) { int retval = 1; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); CORBA::Any timeout_as_any; timeout_as_any <<= timeout_period; @@ -128,12 +126,10 @@ main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE, - timeout_as_any - ACE_ENV_ARG_PARAMETER); + timeout_as_any); policy_current->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); for (CORBA::ULong l = 0; l != policy_list.length (); @@ -142,17 +138,15 @@ main (int argc, char *argv[]) policy_list[l]->destroy (); } - retval = test_timeout (tmp.in () ACE_ENV_ARG_PARAMETER); + retval = test_timeout (tmp.in ()); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index d3d1bac8953..5366059f0e9 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -41,39 +41,37 @@ parse_args (int argc, char *argv[]) } int -single_iteration (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +single_iteration (Test::Oneway_Receiver_ptr oneway_receiver) { - ACE_TRY + try { oneway_receiver->receive_oneway (); ACE_Time_Value tv (0, 40000); ACE_OS::sleep (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return 1; } - ACE_ENDTRY; return 0; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Oneway_Receiver_var oneway_receiver = - Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Receiver::_narrow(tmp.in ()); if (CORBA::is_nil (oneway_receiver.in ())) { @@ -87,8 +85,7 @@ main (int argc, char *argv[]) int exception_count = 0; for (int i = 0; i != iterations; ++i) { - int result = single_iteration (oneway_receiver.in () - ACE_ENV_ARG_PARAMETER); + int result = single_iteration (oneway_receiver.in ()); if (result) exception_count++; else @@ -106,13 +103,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index f6920c41f0f..09818cff227 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) oneway_receiver_impl->_this (); CORBA::String_var ior = - orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_receiver.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -97,17 +97,15 @@ main (int argc, char *argv[]) /*NOTREACHED*/ ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index a69f882baf0..657303fd856 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -21,26 +21,25 @@ Service::dump_results (void) } void -Service::run_test (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::run_test (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)) { int pre_crash_exceptions = - this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER); + this->call_are_you_there (callback); pre_crash_exceptions += - this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); + this->call_test_oneway (callback); - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling crash_now_please\n")); callback->crash_now_please (); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} int pos_crash_exceptions = - this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); + this->call_test_oneway (callback); if (pre_crash_exceptions != 0) { @@ -65,8 +64,7 @@ Service::run_test (Test::Crashed_Callback_ptr callback } int -Service::call_are_you_there (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::call_are_you_there (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n")); @@ -75,22 +73,20 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback int exception_count = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { (void) callback->are_you_there (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { exception_count++; } - ACE_ENDTRY; } return exception_count; } int -Service::call_test_oneway (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) +Service::call_test_oneway (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n")); @@ -99,15 +95,14 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback int exception_count = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { (void) callback->test_oneway (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { exception_count++; } - ACE_ENDTRY; } return exception_count; } diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 6f4de205f13..b0cdc9b35ec 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -23,8 +23,7 @@ public: void dump_results (void); // = The skeleton methods - virtual void run_test (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) + virtual void run_test (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -32,16 +31,14 @@ private: /** * @return Number of exceptions raised */ - int call_are_you_there (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) + int call_are_you_there (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC (()); /// Call the test_oneway method mutiple times. /** * @return Number of exceptions raised */ - int call_test_oneway (Test::Crashed_Callback_ptr callback - ACE_ENV_ARG_DECL) + int call_test_oneway (Test::Crashed_Callback_ptr callback) ACE_THROW_SPEC (()); private: diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 29e6911f75d..09c597bf30a 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +60,9 @@ main (int argc, char *argv[]) // Make all oneways "reliable." { CORBA::Object_var manager_object = - orb->resolve_initial_references("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(manager_object.in() - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow(manager_object.in()); if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,12 +73,10 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length(1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); policy_manager->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); } @@ -89,10 +85,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Service_var service = - Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Service::_narrow(tmp.in ()); if (CORBA::is_nil (service.in ())) { @@ -113,21 +109,19 @@ main (int argc, char *argv[]) poa_manager->activate (); - service->run_test (crashed_callback.in () ACE_ENV_ARG_PARAMETER); + service->run_test (crashed_callback.in ()); orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index e9cec1fbd91..074adc013f5 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,11 +61,9 @@ main (int argc, char *argv[]) // Make all oneways "reliable." { CORBA::Object_var manager_object = - orb->resolve_initial_references("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(manager_object.in() - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow(manager_object.in()); if (CORBA::is_nil (policy_manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -76,12 +74,10 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length(1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); policy_manager->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); } @@ -99,7 +95,7 @@ main (int argc, char *argv[]) service_impl->_this (); CORBA::String_var ior = - orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (service.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -114,23 +110,21 @@ main (int argc, char *argv[]) poa_manager->activate (); ACE_Time_Value tv (50, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); service_impl->dump_results (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index f4a02e95052..7d2fd9d39c0 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -32,10 +32,10 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var obj = - this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); if (CORBA::is_nil (obj.in ())) { @@ -46,7 +46,7 @@ Client_Task::svc (void) } CORBA::Object_var simple_test_obj = - this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (simple_test_input_); if (CORBA::is_nil (simple_test_obj.in ())) { @@ -57,22 +57,20 @@ Client_Task::svc (void) } Test::Simple_Test_var simple_test - = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER); + = Test::Simple_Test::_narrow (simple_test_obj.in ()); - CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER)); + CORBA::Request_var req (obj->_request ("test_basic_arg")); req->add_in_arg ("basic") <<= TEST_BASIC_VALUE; req->send_oneway (); - req = obj->_request ("test_unbounded_string_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_unbounded_string_arg"); req->add_in_arg ("ub_string") <<= TEST_STR; req->send_oneway (); - req = obj->_request ("test_bounded_string_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_bounded_string_arg"); ACE_CString bs (TEST_STR); bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE); @@ -82,8 +80,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_fixed_array_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_fixed_array_arg"); ::Test::Fixed_Array fixed_array; @@ -96,8 +93,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_var_array_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_var_array_arg"); ::Test::Var_Array var_array; @@ -110,8 +106,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_bounded_var_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_bounded_var_size_arg"); ACE_CString bvs (TEST_STR); bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE); @@ -126,8 +121,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_unbounded_var_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_unbounded_var_size_arg"); ::Test::Unbounded_Var_Size_Arg* ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); @@ -139,8 +133,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_fixed_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_fixed_size_arg"); ::Test::TimeOfDay t; t.hour = TEST_HOUR; @@ -151,29 +144,25 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_special_basic_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_special_basic_arg"); req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); req->send_oneway (); - req = obj->_request ("test_object_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_object_arg"); req->add_in_arg ("object") <<= simple_test_obj.in (); req->send_oneway (); - req = obj->_request ("test_objref_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_objref_arg"); req->add_in_arg ("objref") <<= simple_test.in (); req->send_oneway (); - req = obj->_request ("test_args_1" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_1"); req->add_in_arg ("arg1") <<= simple_test_obj.in (); req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); @@ -181,8 +170,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_args_2" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_2"); req->add_in_arg ("arg1") <<= TEST_STR; req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array); @@ -190,8 +178,7 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("test_args_3" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_3"); bd_var_size = new ::Test::Bounded_Var_Size_Arg(); @@ -218,27 +205,24 @@ Client_Task::svc (void) req->send_oneway (); - req = obj->_request ("shutdown" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("shutdown"); req->send_oneway (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { error_count_ ++; - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_CATCHALL + catch (...) { error_count_ ++; ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n")); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp index 13f6ba38c74..92ee6a2eb9a 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp @@ -56,15 +56,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -87,8 +85,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, simple_test_input, @@ -123,10 +120,9 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 05d9fd122ca..a6144215762 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -35,7 +35,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void) void Test_Simple_Test_i::test_method ( ::CORBA::ULong & error_count - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -55,7 +54,6 @@ Hello::Hello (CORBA::ORB_ptr orb, void Hello::test_basic_arg ( ::CORBA::Long basic - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -66,8 +64,7 @@ Hello::test_basic_arg ( } void -Hello::test_unbounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_unbounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -82,8 +79,7 @@ Hello::test_unbounded_string_arg(const char* message void -Hello::test_bounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_bounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -98,8 +94,7 @@ Hello::test_bounded_string_arg(const char* message void -Hello::test_fixed_array_arg(const ::Test::Fixed_Array message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) ACE_THROW_SPEC((CORBA::SystemException)) { for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) @@ -115,8 +110,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message void -Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -128,8 +122,7 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message void -Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -141,8 +134,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message void -Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -158,8 +150,7 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t void -Hello::test_var_array_arg(const Test::Var_Array messages - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_var_array_arg(const Test::Var_Array messages) ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++) @@ -174,8 +165,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages void -Hello::test_special_basic_arg(CORBA::Char value - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_special_basic_arg(CORBA::Char value) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -188,7 +178,6 @@ Hello::test_special_basic_arg(CORBA::Char value void Hello::test_objref_arg ( ::Test::Simple_Test_ptr test - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -205,7 +194,7 @@ void Hello::test_objref_arg ( // 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); + test->test_method (error_count); if (error_count != 0) { ERROR_COUNT ("Hello::test_objref_arg") @@ -215,7 +204,6 @@ void Hello::test_objref_arg ( void Hello::test_object_arg ( ::CORBA::Object_ptr o - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -227,7 +215,7 @@ void Hello::test_object_arg ( CORBA::ULong error_count = 0; error_count ++; - simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); + simple_test->test_method (error_count); if (error_count != 0) { ERROR_COUNT ("Hello::test_object_arg") @@ -238,7 +226,6 @@ void Hello::test_args_1 ( ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -250,9 +237,9 @@ void Hello::test_args_1 ( CORBA::ULong error_count = 0; error_count ++; - simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); + simple_test->test_method (error_count); error_count ++; - arg3->test_method (error_count ACE_ENV_ARG_PARAMETER); + arg3->test_method (error_count); if (error_count != 0) { @@ -267,7 +254,6 @@ void Hello::test_args_2 ( const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -295,7 +281,6 @@ void Hello::test_args_3 ( const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -360,7 +345,6 @@ Hello::test_unbounded_string ( const char * s1, char *& s2, CORBA::String_out s3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -383,7 +367,7 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } CORBA::ULong Hello::error_count () const diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index a72caaab113..8564949a0ff 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -23,7 +23,6 @@ public: virtual void test_method ( ::CORBA::ULong & error_count - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -43,7 +42,6 @@ public: virtual void test_basic_arg ( ::CORBA::Long basic - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -52,7 +50,6 @@ public: virtual void test_unbounded_string_arg ( const char * message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -61,7 +58,6 @@ public: virtual void test_bounded_string_arg ( const char * message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -70,7 +66,6 @@ public: virtual void test_fixed_array_arg ( const ::Test::Fixed_Array message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -79,7 +74,6 @@ public: virtual void test_var_array_arg ( const ::Test::Var_Array messages - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -88,7 +82,6 @@ public: virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -97,7 +90,6 @@ public: virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -106,7 +98,6 @@ public: virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,7 +106,6 @@ public: virtual void test_special_basic_arg ( ::CORBA::Char value - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -124,7 +114,6 @@ public: virtual void test_objref_arg ( ::Test::Simple_Test_ptr test - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -133,7 +122,6 @@ public: virtual void test_object_arg ( ::CORBA::Object_ptr o - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -144,7 +132,6 @@ public: ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -155,7 +142,6 @@ public: const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -167,7 +153,6 @@ public: const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -181,7 +166,6 @@ public: const char * s1, char *& s2, CORBA::String_out s3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp index 6d842101da5..22a22d3b099 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -29,15 +29,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +57,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -85,8 +82,7 @@ Server_Task::svc (void) simple_impl->_this (); CORBA::String_var simple_test_ior = - this->sorb_->object_to_string (simple_test.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (simple_test.in ()); // Output the IOR to the <this->output_> FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_, @@ -115,20 +111,18 @@ Server_Task::svc (void) error_count_ += errors; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { error_count_ ++; - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_CATCHALL + catch (...) { error_count_ ++; ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n")); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index 199301ed2cf..a6b4a921625 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -32,10 +32,10 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var obj = - this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); if (CORBA::is_nil (obj.in ())) { @@ -46,7 +46,7 @@ Client_Task::svc (void) } CORBA::Object_var simple_test_obj = - this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (simple_test_input_); if (CORBA::is_nil (simple_test_obj.in ())) { @@ -57,9 +57,9 @@ Client_Task::svc (void) } Test::Simple_Test_var simple_test - = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER); + = Test::Simple_Test::_narrow (simple_test_obj.in ()); CORBA::Long l = 200; - CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER)); + CORBA::Request_var req (obj->_request ("test_basic_arg")); req->add_in_arg ("basic") <<= TEST_BASIC_VALUE; req->add_out_arg ("x") <<= l; req->invoke (); @@ -68,15 +68,13 @@ CORBA::Long l = 200; } - req = obj->_request ("test_unbounded_string_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_unbounded_string_arg"); req->add_in_arg ("ub_string") <<= TEST_STR; req->invoke (); - req = obj->_request ("test_bounded_string_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_bounded_string_arg"); ACE_CString bs (TEST_STR); bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE); @@ -86,8 +84,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_fixed_array_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_fixed_array_arg"); ::Test::Fixed_Array fixed_array; @@ -100,8 +97,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_var_array_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_var_array_arg"); ::Test::Var_Array var_array; @@ -114,8 +110,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_bounded_var_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_bounded_var_size_arg"); ACE_CString bvs (TEST_STR); bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE); @@ -130,8 +125,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_unbounded_var_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_unbounded_var_size_arg"); ::Test::Unbounded_Var_Size_Arg* ub_var_size = new ::Test::Unbounded_Var_Size_Arg(); @@ -143,8 +137,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_fixed_size_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_fixed_size_arg"); ::Test::TimeOfDay t; t.hour = TEST_HOUR; @@ -155,29 +148,25 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_special_basic_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_special_basic_arg"); req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); req->invoke (); - req = obj->_request ("test_object_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_object_arg"); req->add_in_arg ("object") <<= simple_test_obj.in (); req->invoke (); - req = obj->_request ("test_objref_arg" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_objref_arg"); req->add_in_arg ("objref") <<= simple_test.in (); req->invoke (); - req = obj->_request ("test_args_1" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_1"); req->add_in_arg ("arg1") <<= simple_test_obj.in (); req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE); @@ -185,8 +174,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_args_2" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_2"); req->add_in_arg ("arg1") <<= TEST_STR; req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array); @@ -194,8 +182,7 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("test_args_3" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("test_args_3"); bd_var_size = new ::Test::Bounded_Var_Size_Arg(); @@ -222,27 +209,24 @@ CORBA::Long l = 200; req->invoke (); - req = obj->_request ("shutdown" - ACE_ENV_ARG_PARAMETER); + req = obj->_request ("shutdown"); req->send_oneway (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { error_count_ ++; - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_CATCHALL + catch (...) { error_count_ ++; ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n")); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp index 4d831212bad..35c454f7f02 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp @@ -60,15 +60,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -91,8 +89,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, simple_test_input, @@ -127,10 +124,9 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index 78cdaa8e2ad..d4e2a521bfe 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -35,7 +35,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void) void Test_Simple_Test_i::test_method ( ::CORBA::ULong & error_count - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -56,7 +55,6 @@ void Hello::test_basic_arg ( ::CORBA::Long basic, ::CORBA::Long_out x - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,8 +67,7 @@ Hello::test_basic_arg ( } void -Hello::test_unbounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_unbounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -85,8 +82,7 @@ Hello::test_unbounded_string_arg(const char* message void -Hello::test_bounded_string_arg(const char* message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_bounded_string_arg(const char* message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -101,8 +97,7 @@ Hello::test_bounded_string_arg(const char* message void -Hello::test_fixed_array_arg(const ::Test::Fixed_Array message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) ACE_THROW_SPEC((CORBA::SystemException)) { for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) @@ -118,8 +113,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message void -Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -131,8 +125,7 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message void -Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -144,8 +137,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message void -Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -161,8 +153,7 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t void -Hello::test_var_array_arg(const Test::Var_Array messages - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_var_array_arg(const Test::Var_Array messages) ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++) @@ -177,8 +168,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages void -Hello::test_special_basic_arg(CORBA::Char value - ACE_ENV_ARG_DECL_NOT_USED) +Hello::test_special_basic_arg(CORBA::Char value) ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) @@ -191,7 +181,6 @@ Hello::test_special_basic_arg(CORBA::Char value void Hello::test_objref_arg ( ::Test::Simple_Test_ptr test - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,7 +197,7 @@ void Hello::test_objref_arg ( // 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); + test->test_method (error_count); if (error_count != 0) { ERROR_COUNT ("Hello::test_objref_arg") @@ -218,7 +207,6 @@ void Hello::test_objref_arg ( void Hello::test_object_arg ( ::CORBA::Object_ptr o - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -230,7 +218,7 @@ void Hello::test_object_arg ( CORBA::ULong error_count = 0; error_count ++; - simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); + simple_test->test_method (error_count); if (error_count != 0) { ERROR_COUNT ("Hello::test_object_arg") @@ -241,7 +229,6 @@ void Hello::test_args_1 ( ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -253,9 +240,9 @@ void Hello::test_args_1 ( CORBA::ULong error_count = 0; error_count ++; - simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER); + simple_test->test_method (error_count); error_count ++; - arg3->test_method (error_count ACE_ENV_ARG_PARAMETER); + arg3->test_method (error_count); if (error_count != 0) { @@ -270,7 +257,6 @@ void Hello::test_args_2 ( const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -298,7 +284,6 @@ void Hello::test_args_3 ( const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,7 +348,6 @@ Hello::test_unbounded_string ( const char * s1, char *& s2, CORBA::String_out s3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -386,7 +370,7 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } CORBA::ULong Hello::error_count () const diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h index 1b98b672e49..f97f94609c9 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h @@ -23,7 +23,6 @@ public: virtual void test_method ( ::CORBA::ULong & error_count - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -44,7 +43,6 @@ public: void test_basic_arg ( ::CORBA::Long basic, ::CORBA::Long_out x - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -53,7 +51,6 @@ public: virtual void test_unbounded_string_arg ( const char * message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -62,7 +59,6 @@ public: virtual void test_bounded_string_arg ( const char * message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -71,7 +67,6 @@ public: virtual void test_fixed_array_arg ( const ::Test::Fixed_Array message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -80,7 +75,6 @@ public: virtual void test_var_array_arg ( const ::Test::Var_Array messages - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -89,7 +83,6 @@ public: virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -98,7 +91,6 @@ public: virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -107,7 +99,6 @@ public: virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -116,7 +107,6 @@ public: virtual void test_special_basic_arg ( ::CORBA::Char value - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -125,7 +115,6 @@ public: virtual void test_objref_arg ( ::Test::Simple_Test_ptr test - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,7 +123,6 @@ public: virtual void test_object_arg ( ::CORBA::Object_ptr o - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -145,7 +133,6 @@ public: ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -156,7 +143,6 @@ public: const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -168,7 +154,6 @@ public: const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -182,7 +167,6 @@ public: const char * s1, char *& s2, CORBA::String_out s3 - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp index 7fe8450cec0..2a252386ff0 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp @@ -27,15 +27,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -57,8 +55,7 @@ Server_Task::svc (void) hello_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (hello.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (hello.in ()); // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, @@ -83,8 +80,7 @@ Server_Task::svc (void) simple_impl->_this (); CORBA::String_var simple_test_ior = - this->sorb_->object_to_string (simple_test.in () - ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (simple_test.in ()); // Output the IOR to the <this->output_> FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_, @@ -113,20 +109,18 @@ Server_Task::svc (void) error_count_ += errors; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { error_count_ ++; - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_CATCHALL + catch (...) { error_count_ ++; ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n")); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index 1fc1616bde9..7c43180ab80 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -65,8 +65,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) // ----------------------------------------------------------------- // Boilerplate CORBA/TAO client-side ORB initialization code. // ----------------------------------------------------------------- - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Prepend a "dummy" program name argument to the Service // Configurator argument vector. @@ -89,8 +88,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) // Initialize the ORB. this->orb_ = CORBA::ORB_init (new_argc, new_argv.get_buffer (), - "CLIENT" - ACE_ENV_ARG_PARAMETER); + "CLIENT"); if (CORBA::is_nil (this->orb_.in ())) return -1; @@ -99,10 +97,10 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) return 1; CORBA::Object_var obj = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); this->test_ = - Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (obj.in ()); if (CORBA::is_nil (this->test_.in ())) { @@ -112,14 +110,12 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) 1); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Test_Client_Module::init")); + ex._tao_print_exception (ACE_TEXT ("Test_Client_Module::init")); return -1; } - ACE_ENDTRY; #if defined (ACE_HAS_THREADS) @@ -157,8 +153,7 @@ Test_Client_Module::fini (void) int Test_Client_Module::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Invoke an operation on the Test object. this->test_->invoke_me (); @@ -190,13 +185,11 @@ Test_Client_Module::svc (void) (void) this->test_.out (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Test_Client_Module::svc")); + ex._tao_print_exception (ACE_TEXT ("Test_Client_Module::svc")); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 6293a6d79c3..9a1dbb1f1f8 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -66,8 +66,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) // ----------------------------------------------------------------- // Boilerplate CORBA/TAO server-side ORB initialization code. // ----------------------------------------------------------------- - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Add one to the new argc since "dummy" is being added to the // argv vector. @@ -90,14 +89,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) // Initialize the ORB. this->orb_ = CORBA::ORB_init (new_argc, new_argv.get_buffer (), - "SERVER" - ACE_ENV_ARG_PARAMETER); + "SERVER"); if (CORBA::is_nil (this->orb_.in ())) return -1; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -105,7 +103,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) 1); this->poa_ = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); this->poa_manager_ = this->poa_->the_POAManager (); @@ -117,7 +115,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) CORBA::Object_var obj = this->servant_._this (); CORBA::String_var ior = - this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", @@ -136,13 +134,11 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) this->servant_.orb (this->orb_.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Test_Server_Module::init")); + ex._tao_print_exception (ACE_TEXT ("Test_Server_Module::init")); return -1; } - ACE_ENDTRY; #if defined (ACE_HAS_THREADS) @@ -180,8 +176,7 @@ Test_Server_Module::fini (void) int Test_Server_Module::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Run the ORB event loop in its own thread. this->orb_->run (); @@ -203,13 +198,11 @@ Test_Server_Module::svc (void) this->orb_->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Test_Server_Module::svc")); + ex._tao_print_exception (ACE_TEXT ("Test_Server_Module::svc")); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index 7addbc89cef..43deb11f19d 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -12,7 +12,7 @@ Test_i::Test_i (void) } void -Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +Test_i::invoke_me ( /* */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, @@ -27,7 +27,7 @@ Test_i::shutdown (void) "Server is shutting down.\n")); if (!CORBA::is_nil (this->orb_.in ())) - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index c2b3cd74038..c0d5e122d0e 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -63,10 +63,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) { @@ -74,10 +74,10 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -129,8 +129,7 @@ main (int argc, char *argv[]) server->test_method (i, the_in_structure, the_out_structure.out (), - name.inout () - ACE_ENV_ARG_PARAMETER); + name.inout ()); if (TAO_debug_level > 0) { @@ -160,10 +159,9 @@ main (int argc, char *argv[]) server->shutdown (); } } - ACE_CATCH (test_exception, ex) + catch (const test_exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); ACE_DEBUG ((LM_DEBUG, "error code: %d\n" @@ -175,20 +173,17 @@ main (int argc, char *argv[]) return 0; } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception caught - "); + ex._tao_print_exception ("Client: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index 10cff9f4c34..0da6e8dda4d 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -56,13 +56,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -72,7 +72,7 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -85,21 +85,19 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); DSI_Simple_Server server_impl (orb.in (), object.in (), root_poa.in ()); PortableServer::ObjectId_var oid = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var server = - root_poa->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (oid.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -124,13 +122,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Gateway: exception caught - "); + ex._tao_print_exception ("Gateway: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index 4225a84ed95..3ee312a38ce 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -59,7 +59,7 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -75,7 +75,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -102,13 +102,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception caught - "); + ex._tao_print_exception ("Server: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 871e6d72203..662e7bc2b09 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -11,14 +11,13 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$") void -DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request - ACE_ENV_ARG_DECL) +DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::NVList_ptr list; - this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER); + this->orb_->create_list (0, list); - request->arguments (list ACE_ENV_ARG_PARAMETER); + request->arguments (list); CORBA::Request_var target_request; @@ -29,20 +28,19 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request 0, // exception_list, 0, // context_list, target_request.inout (), - 0 - ACE_ENV_ARG_PARAMETER); + 0); target_request->_tao_lazy_evaluation (1); // Outgoing request must have the same byte order as the incoming one. target_request->_tao_byte_order (request->_tao_incoming_byte_order ()); - ACE_TRY + try { // Updates the byte order state, if necessary. target_request->invoke (); } - ACE_CATCH (CORBA::UNKNOWN, ex) + catch (const CORBA::UNKNOWN& ex) { ACE_UNUSED_ARG (ex); @@ -53,21 +51,19 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request return; } - ACE_ENDTRY; // Outgoing reply must have the same byte order as the incoming one. request->_tao_reply_byte_order (target_request->_tao_byte_order ()); if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } } CORBA::RepositoryId DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::POA_ptr) ACE_THROW_SPEC (()) { return CORBA::string_dup ("IDL:Simple_Server:1.0"); diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h index 336f6ce56d7..cd81121075c 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.h +++ b/TAO/tests/DSI_Gateway/test_dsi.h @@ -36,19 +36,16 @@ public: // ctor // = The DynamicImplementation methods. - virtual void invoke (CORBA::ServerRequest_ptr request - ACE_ENV_ARG_DECL) + virtual void invoke (CORBA::ServerRequest_ptr request) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (()); virtual PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL ); private: diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index 18e3806a5dd..c9eeeefa7e4 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -13,8 +13,7 @@ CORBA::Long Simple_Server_i::test_method (CORBA::Long x, const Structure& the_in_structure, Structure_out the_out_structure, - char *&name - ACE_ENV_ARG_DECL_NOT_USED) + char *&name) ACE_THROW_SPEC ((CORBA::SystemException)) { Structure *tmp = 0; @@ -43,23 +42,21 @@ Simple_Server_i::raise_user_exception (void) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)) { - ACE_THROW (test_exception (33, - "reactor meltdown", - "kaput")); + throw test_exception (33, "reactor meltdown", "kaput"); } void Simple_Server_i::raise_system_exception (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } CORBA::Long @@ -70,7 +67,7 @@ Simple_Server_i::test_val (void) } void -Simple_Server_i::test_val (CORBA::Long tv ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::test_val (CORBA::Long tv) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index d485a551247..9ec76830813 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -34,14 +34,13 @@ public: CORBA::Long test_method (CORBA::Long x, const Structure& the_in_structure, Structure_out the_out_structure, - char *&name - ACE_ENV_ARG_DECL_NOT_USED) + char *&name) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long test_val (void) ACE_THROW_SPEC (( CORBA::SystemException)); - void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void test_val (CORBA::Long test_val) ACE_THROW_SPEC ((CORBA::SystemException)); void raise_user_exception (void) diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp index c7938aaedb2..529ed21792c 100644 --- a/TAO/tests/DynAny_Test/analyzer.cpp +++ b/TAO/tests/DynAny_Test/analyzer.cpp @@ -79,7 +79,7 @@ void DynAnyAnalyzer::resetTab (void) level_ = 0; } -void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) +void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da) { CORBA::TypeCode_var tc = da->type (); @@ -100,7 +100,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) case CORBA::tk_struct: { DynamicAny::DynStruct_var ds - = DynamicAny::DynStruct::_narrow (da ACE_ENV_ARG_PARAMETER); + = DynamicAny::DynStruct::_narrow (da); tab (level_); @@ -132,7 +132,7 @@ 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); + this->analyze (cc.in ()); } } while (da->next ()); @@ -151,7 +151,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) else { DynamicAny::DynSequence_var ds = - DynamicAny::DynSequence::_narrow (da ACE_ENV_ARG_PARAMETER); + DynamicAny::DynSequence::_narrow (da); int i = 0; tab(level_); @@ -178,7 +178,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (!CORBA::is_nil (cc.in ())) { - analyze (cc.in () ACE_ENV_ARG_PARAMETER); + analyze (cc.in ()); } i++; @@ -218,7 +218,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) if (!CORBA::is_nil (cc.in ())) { - analyze (cc.in () ACE_ENV_ARG_PARAMETER); + analyze (cc.in ()); } da->next (); @@ -230,7 +230,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) case CORBA::tk_union: { DynamicAny::DynUnion_var value = - DynamicAny::DynUnion::_narrow (da ACE_ENV_ARG_PARAMETER); + DynamicAny::DynUnion::_narrow (da); if (!value->has_no_active_member ()) { @@ -238,7 +238,7 @@ 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); + this->analyze (disc.in ()); } } } @@ -250,12 +250,11 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) CORBA::Any_var any = da->get_any (); dynany = - dynany_factory_->create_dyn_any (any.in () - ACE_ENV_ARG_PARAMETER); + dynany_factory_->create_dyn_any (any.in ()); if (!CORBA::is_nil (dynany.in ())) { - this->analyze (dynany.in () ACE_ENV_ARG_PARAMETER); + this->analyze (dynany.in ()); } dynany->destroy (); @@ -265,7 +264,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) case CORBA::tk_enum: { DynamicAny::DynEnum_var value = - DynamicAny::DynEnum::_narrow (da ACE_ENV_ARG_PARAMETER); + DynamicAny::DynEnum::_narrow (da); CORBA::String_var s = value->get_as_string (); tab (level_); diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h index dce4ba0aeed..1d071a3384c 100644 --- a/TAO/tests/DynAny_Test/analyzer.h +++ b/TAO/tests/DynAny_Test/analyzer.h @@ -33,7 +33,7 @@ public: void resetTab (void); - void analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL); + void analyze (DynamicAny::DynAny_ptr da); 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 206e24d7cb6..786295d28b8 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -36,9 +36,8 @@ Data::Data (CORBA::ORB_var orb) m_wchar1 (666), m_wchar2 (0), orb_ (orb) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { m_shortseq1.length (3UL); m_shortseq1[0UL] = 0; @@ -66,8 +65,7 @@ Data::Data (CORBA::ORB_var orb) // Getting the RootPOA so we can generate object references. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (obj.in ())) @@ -78,33 +76,27 @@ Data::Data (CORBA::ORB_var orb) // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Generate values for the member variables. this->m_objref1 = - root_poa->create_reference ("foo" - ACE_ENV_ARG_PARAMETER); + root_poa->create_reference ("foo"); this->m_objref2 = - root_poa->create_reference ("foo" - ACE_ENV_ARG_PARAMETER); + root_poa->create_reference ("foo"); // Clean up after the POA root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in ORB/POA init\n"); + ex._tao_print_exception ("Exception in ORB/POA init\n"); } - ACE_ENDTRY; } Data::~Data (void) diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 3bef704e0e8..5db43f01425 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -66,13 +66,12 @@ Driver::~Driver (void) int Driver::init (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { // Retrieve the underlying ORB this->orb_ = CORBA::ORB_init (argc, argv, - "local" - ACE_ENV_ARG_PARAMETER); + "local"); // Parse command line and verify parameters. @@ -83,13 +82,11 @@ Driver::init (int argc, char* argv[]) -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Driver::init"); + ex._tao_print_exception ("Driver::init"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 02ce71c105f..5694eb24793 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -43,7 +43,7 @@ Test_DynAny::run_test (void) { Data data (this->orb_); - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -53,12 +53,10 @@ Test_DynAny::run_test (void) "testing: constructor(Any)/insert/get\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -74,10 +72,9 @@ Test_DynAny::run_test (void) CORBA::Any in1; in1 <<= data.m_double2; DynamicAny::DynAny_var fa1 = - dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in1); - fa1->insert_double (data.m_double1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_double (data.m_double1); CORBA::Double d_out = fa1->get_double (); @@ -97,13 +94,11 @@ Test_DynAny::run_test (void) d_out = data.m_double2; DynamicAny::DynAny_var ftc1 = - dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double); CORBA::Any in_any1; in_any1 <<= data.m_double1; - ftc1->from_any (in_any1 - ACE_ENV_ARG_PARAMETER); - analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); + ftc1->from_any (in_any1); + analyzer.analyze (ftc1.in()); CORBA::Any_var out_any1 = ftc1->to_any (); out_any1 >>= d_out; @@ -130,15 +125,12 @@ Test_DynAny::run_test (void) CORBA::Any in; in <<= data.m_typecode2; DynamicAny::DynAny_var fa2 = - dynany_factory->create_dyn_any (in - ACE_ENV_ARG_PARAMETER); - fa2->insert_typecode (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in); + fa2->insert_typecode (data.m_typecode1); CORBA::TypeCode_var tc_out = fa2->get_typecode (); - if (tc_out->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER)) + if (tc_out->equal (data.m_typecode1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -153,19 +145,16 @@ Test_DynAny::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc2 = - dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode); CORBA::Any in_any2; in_any2 <<= data.m_typecode1; - ftc2->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); - analyzer.analyze (ftc2.in() ACE_ENV_ARG_PARAMETER); + ftc2->from_any (in_any2); + analyzer.analyze (ftc2.in()); 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); + CORBA::Boolean equal = out_tc->equal (data.m_typecode1); if (equal) { @@ -193,10 +182,8 @@ Test_DynAny::run_test (void) ss.length (0UL); in3 <<= ss; DynamicAny::DynAny_var fa3 = - dynany_factory->create_dyn_any (in3 - ACE_ENV_ARG_PARAMETER); - fa3->insert_short_seq (data.m_shortseq1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in3); + fa3->insert_short_seq (data.m_shortseq1); data.m_shortseq2 = fa3->get_short_seq (); @@ -230,13 +217,11 @@ Test_DynAny::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc3 = - dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq); CORBA::Any in_any3; in_any3 <<= data.m_shortseq1; - ftc3->from_any (in_any3 - ACE_ENV_ARG_PARAMETER); - analyzer.analyze (ftc3.in () ACE_ENV_ARG_PARAMETER); + ftc3->from_any (in_any3); + analyzer.analyze (ftc3.in ()); CORBA::Any_var out_any3 = ftc3->to_any (); CORBA::ShortSeq *outseq = 0; @@ -271,13 +256,11 @@ Test_DynAny::run_test (void) fa3->destroy (); ftc3->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynany::run_test"); + ex._tao_print_exception ("test_dynany::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index e502bb36b6d..3fdcdddf750 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -45,7 +45,7 @@ Test_DynArray::run_test (void) DynAnyTests::test_array ta = {0}; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -55,12 +55,10 @@ Test_DynArray::run_test (void) "testing: constructor(Any)/insert/get/seek/rewind/current_component\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -76,22 +74,19 @@ Test_DynArray::run_test (void) CORBA::Any in_any1; in_any1 <<= DynAnyTests::test_array_forany (ta); DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynArray_var fa1 = - DynamicAny::DynArray::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynArray::_narrow (dp1.in ()); - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1); - fa1->insert_long (data.m_long1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_long (data.m_long1); fa1->rewind (); CORBA::Long l_out1 = data.m_long2; - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1); l_out1 = fa1->get_long (); @@ -109,12 +104,10 @@ Test_DynArray::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc1_base = - dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array); DynamicAny::DynArray_var ftc1 = - DynamicAny::DynArray::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynArray::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -127,11 +120,10 @@ Test_DynArray::run_test (void) CORBA::Any in_any2; in_any2 <<= DynAnyTests::test_array_forany (ta); - ftc1->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); + ftc1->from_any (in_any2); - analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); + analyzer.analyze (ftc1.in ()); CORBA::Any_var out_any1 = ftc1->to_any (); @@ -158,8 +150,7 @@ Test_DynArray::run_test (void) in_any3 <<= data.m_long1; as_in[0] = in_any3; as_in[1] = in_any3; - ftc1->set_elements (as_in - ACE_ENV_ARG_PARAMETER); + ftc1->set_elements (as_in); DynamicAny::AnySeq_var as_out = ftc1->get_elements (); @@ -181,13 +172,11 @@ Test_DynArray::run_test (void) ftc1->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynarray::run_test"); + ex._tao_print_exception ("test_dynarray::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index f9da0a41706..47631c8f55e 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -41,18 +41,16 @@ Test_DynEnum::test_name (void) const int Test_DynEnum::run_test (void) { - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/set_as_string/get_as_ulong\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -69,22 +67,19 @@ Test_DynEnum::run_test (void) CORBA::Any in_any1; in_any1 <<= te; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynEnum_var de1 = - DynamicAny::DynEnum::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynEnum::_narrow (dp1.in ()); - analyzer.analyze(dp1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(dp1.in()); - de1->set_as_string ("TE_FIRST" - ACE_ENV_ARG_PARAMETER); + de1->set_as_string ("TE_FIRST"); CORBA::ULong ul_out1 = de1->get_as_ulong (); - analyzer.analyze(de1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(de1.in()); CORBA::Any_var out_any2 = de1->to_any (); @@ -103,8 +98,7 @@ Test_DynEnum::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: set_as_ulong/get_as_string\n")); - de1->set_as_ulong (3 - ACE_ENV_ARG_PARAMETER); + de1->set_as_ulong (3); CORBA::String_var s = de1->get_as_string (); @@ -123,12 +117,10 @@ Test_DynEnum::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var de2_base = - dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum); DynamicAny::DynEnum_var de2 = - DynamicAny::DynEnum::_narrow (de2_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynEnum::_narrow (de2_base.in ()); if (CORBA::is_nil (de2.in ())) { @@ -139,10 +131,9 @@ Test_DynEnum::run_test (void) CORBA::Any in_any2; in_any2 <<= DynAnyTests::TE_THIRD; - de2->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); + de2->from_any (in_any2); - analyzer.analyze(de2.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(de2.in()); CORBA::Any_var out_any1 = de2->to_any (); @@ -163,8 +154,7 @@ Test_DynEnum::run_test (void) "testing: equal\n")); CORBA::Boolean equal = - de1->equal (de2.in () - ACE_ENV_ARG_PARAMETER); + de1->equal (de2.in ()); if (equal) { @@ -180,13 +170,11 @@ Test_DynEnum::run_test (void) de2->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynenum::run_test"); + ex._tao_print_exception ("test_dynenum::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 80373bc717d..d5cc2a9d623 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -46,7 +46,7 @@ Test_DynSequence::run_test (void) DynAnyTests::test_seq ts (2); ts.length (2); - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -57,12 +57,10 @@ Test_DynSequence::run_test (void) "rewind/current_component\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -85,9 +83,9 @@ Test_DynSequence::run_test (void) any <<= shortseq1; DynamicAny::DynAny_var shortdany = - dynany_factory->create_dyn_any (any ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (any); - analyzer.analyze(shortdany.in () ACE_ENV_ARG_PARAMETER); + analyzer.analyze(shortdany.in ()); CORBA::Any_var any3; any3 = shortdany->to_any (); @@ -97,21 +95,18 @@ Test_DynSequence::run_test (void) CORBA::Any in_any1; in_any1 <<= ts; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynSequence_var fa1 = - DynamicAny::DynSequence::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynSequence::_narrow (dp1.in ()); - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1); - fa1->insert_string (data.m_string1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_string (data.m_string1); fa1->rewind (); - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1); CORBA::String_var out_str1 = fa1->get_string (); @@ -152,12 +147,10 @@ Test_DynSequence::run_test (void) { elem_any <<= CORBA::Any::from_string (values[i], 8); - elements[i] = dynany_factory->create_dyn_any (elem_any - ACE_ENV_ARG_PARAMETER); + elements[i] = dynany_factory->create_dyn_any (elem_any); } - fa1->set_elements_as_dyn_any (elements.in () - ACE_ENV_ARG_PARAMETER); + fa1->set_elements_as_dyn_any (elements.in ()); DynamicAny::DynAnySeq_var out_elems = fa1->get_elements_as_dyn_any (); @@ -168,7 +161,7 @@ Test_DynSequence::run_test (void) return -1; } - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze (fa1.in()); CORBA::String_var out_str; @@ -177,8 +170,7 @@ Test_DynSequence::run_test (void) out_str = out_elems[i]->get_string (); CORBA::Boolean equal = - out_elems[i]->equal (elements[i] - ACE_ENV_ARG_PARAMETER); + out_elems[i]->equal (elements[i]); if (!equal) { @@ -202,12 +194,10 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_seq - ACE_ENV_ARG_PARAMETER ); DynamicAny::DynSequence_var ftc1 = - DynamicAny::DynSequence::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynSequence::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -219,10 +209,9 @@ Test_DynSequence::run_test (void) ts[0] = CORBA::string_dup (data.m_string1); CORBA::Any in_any2; in_any2 <<= ts; - ftc1->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); + ftc1->from_any (in_any2); - analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze (ftc1.in()); CORBA::Any_var out_any1 = ftc1->to_any (); @@ -250,8 +239,7 @@ Test_DynSequence::run_test (void) ++this->error_count_; } - ftc1->set_length (3 - ACE_ENV_ARG_PARAMETER); + ftc1->set_length (3); DynamicAny::AnySeq as_in (3); as_in.length (3); CORBA::Any in_any3; @@ -260,8 +248,7 @@ Test_DynSequence::run_test (void) as_in[1] = in_any3; in_any3 <<= CORBA::Any::from_string (data.m_string1, 8); as_in[2] = in_any3; - ftc1->set_elements (as_in - ACE_ENV_ARG_PARAMETER); + ftc1->set_elements (as_in); DynamicAny::AnySeq_var as_out = ftc1->get_elements (); @@ -286,13 +273,11 @@ Test_DynSequence::run_test (void) ftc1->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynsequence::run_test"); + ex._tao_print_exception ("test_dynsequence::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 2bb8ede9fb8..65535b8605f 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -50,19 +50,17 @@ Test_DynStruct::run_test (void) ts.es.f = data.m_float2; ts.es.s = data.m_short2; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/insert/get/next/seek/" "rewind/current_component\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -78,33 +76,27 @@ Test_DynStruct::run_test (void) CORBA::Any in_any1; in_any1 <<= ts; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynStruct_var fa1 = - DynamicAny::DynStruct::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynStruct::_narrow (dp1.in ()); - fa1->insert_char (data.m_char1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_char (data.m_char1); fa1->next (); - fa1->insert_short_seq (data.m_shortseq1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_short_seq (data.m_shortseq1); fa1->next (); DynamicAny::DynAny_var cc = fa1->current_component (); - cc->insert_float (data.m_float1 - ACE_ENV_ARG_PARAMETER); + cc->insert_float (data.m_float1); cc->next (); - cc->insert_short (data.m_short1 - ACE_ENV_ARG_PARAMETER); + cc->insert_short (data.m_short1); cc->rewind (); // To show that calling destroy() on a component does @@ -148,7 +140,7 @@ Test_DynStruct::run_test (void) cc = fa1->current_component (); - cc->seek (1 ACE_ENV_ARG_PARAMETER); + cc->seek (1); CORBA::Short s = cc->get_short (); @@ -169,12 +161,10 @@ Test_DynStruct::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_struct - ACE_ENV_ARG_PARAMETER ); DynamicAny::DynStruct_var ftc1 = - DynamicAny::DynStruct::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynStruct::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -189,10 +179,9 @@ Test_DynStruct::run_test (void) ts.es.s = data.m_short1; CORBA::Any in_any2; in_any2 <<= ts; - ftc1->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); + ftc1->from_any (in_any2); - analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); + analyzer.analyze (ftc1.in ()); CORBA::Any_var out_any1 = ftc1->to_any (); @@ -218,18 +207,14 @@ Test_DynStruct::run_test (void) CORBA::Any_var out_any2 ; DynamicAny::DynStruct_var ftc2; - ACE_TRY_EX (bad_kind) + try { DynamicAny::DynAny_var ftc2_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_struct_alias - ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK_EX (bad_kind); - ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ()); if (CORBA::is_nil (ftc2.in ())) { @@ -244,27 +229,23 @@ Test_DynStruct::run_test (void) ts.es.s = data.m_short1; CORBA::Any in_any3; in_any3 <<= ts; - ftc2->from_any (in_any3 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + ftc2->from_any (in_any3); // char c = ftc2->get_char (); // CORBA::Boolean status = ftc2->next (); // CORBA::Long lo = ftc2->get_long (); -// analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER); +// analyzer.analyze (ftc2.in ()); out_any2 = ftc2->to_any (); - ACE_TRY_CHECK_EX (bad_kind); if (!(out_any2.in () >>= ts_out2)) // problem { ts_out2 = 0; } } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch (const CORBA::TypeCode::BadKind& ) { } - ACE_ENDTRY; if (ts_out2 != 0 && ts_out2->es.s == data.m_short1) { @@ -280,7 +261,7 @@ Test_DynStruct::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: current_member_name/current_member_kind\n")); - ftc1->seek (2 ACE_ENV_ARG_PARAMETER); + ftc1->seek (2); DynamicAny::FieldName_var fn = ftc1->current_member_name (); @@ -307,8 +288,7 @@ Test_DynStruct::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: current_member_name/current_member_kind " "with alias\n")); - ftc2->seek (2 - ACE_ENV_ARG_PARAMETER); + ftc2->seek (2); DynamicAny::FieldName_var fn2 = ftc2->current_member_name (); @@ -341,12 +321,10 @@ Test_DynStruct::run_test (void) DynamicAny::DynAny_var sm_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_struct - ACE_ENV_ARG_PARAMETER ); DynamicAny::DynStruct_var sm = - DynamicAny::DynStruct::_narrow (sm_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynStruct::_narrow (sm_base.in ()); if (CORBA::is_nil (sm.in ())) { @@ -355,8 +333,7 @@ Test_DynStruct::run_test (void) -1); } - sm->set_members (nvps.in () - ACE_ENV_ARG_PARAMETER); + sm->set_members (nvps.in ()); DynamicAny::NameValuePairSeq_var gm = sm->get_members (); @@ -374,13 +351,11 @@ Test_DynStruct::run_test (void) sm->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynstruct::run_test"); + ex._tao_print_exception ("test_dynstruct::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index 3e260d464e2..b24a4542d78 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -44,19 +44,17 @@ Test_DynUnion::run_test (void) DynAnyTests::test_union tu; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", data.labels[12])); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -76,19 +74,16 @@ Test_DynUnion::run_test (void) CORBA::Any in_any4; in_any4 <<= tstring; DynamicAny::DynAny_var dp4 = - dynany_factory->create_dyn_any (in_any4 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any4); DynamicAny::DynUnion_var fa4 = - DynamicAny::DynUnion::_narrow (dp4.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynUnion::_narrow (dp4.in ()); - analyzer.analyze(fa4.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(fa4.in()); CORBA::Any_var out_any5 = fa4->to_any (); DynamicAny::DynAny_var dp5 = - dynany_factory->create_dyn_any (out_any5.in() - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (out_any5.in()); ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/insert/get\n")); @@ -98,21 +93,16 @@ Test_DynUnion::run_test (void) CORBA::Any in_any1; in_any1 <<= tu; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynUnion_var fa1 = - DynamicAny::DynUnion::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); - fa1->seek (1 - ACE_ENV_ARG_PARAMETER); - fa1->insert_typecode (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynUnion::_narrow (dp1.in ()); + fa1->seek (1); + fa1->insert_typecode (data.m_typecode1); CORBA::TypeCode_var s_out1 = fa1->get_typecode (); CORBA::Boolean const equal_tc1 = - s_out1->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); + s_out1->equal (data.m_typecode1); if (equal_tc1) { @@ -127,16 +117,14 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze (fa1.in()); 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); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union); DynamicAny::DynUnion_var ftc1 = - DynamicAny::DynUnion::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynUnion::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -145,17 +133,15 @@ Test_DynUnion::run_test (void) -1); } - ftc1->from_any (out_any1.in () - ACE_ENV_ARG_PARAMETER); + ftc1->from_any (out_any1.in ()); - ftc1->seek (1 ACE_ENV_ARG_PARAMETER); + ftc1->seek (1); CORBA::TypeCode_var s_out2 = ftc1->get_typecode (); CORBA::Boolean const equal_tc2 = - s_out2->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); + s_out2->equal (data.m_typecode1); if (equal_tc2) { @@ -170,23 +156,20 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode alias)/from_any/to_any\n")); - analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze( fa1.in()); CORBA::Any_var out_any2 = fa1->to_any (); CORBA::TypeCode_var s_out3; - ACE_TRY_EX (bad_kind) + try { DynamicAny::DynAny_var ftc2_base = dynany_factory->create_dyn_any_from_type_code - (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + (DynAnyTests::_tc_test_union_alias); DynamicAny::DynUnion_var ftc2 = - DynamicAny::DynUnion::_narrow (ftc2_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + DynamicAny::DynUnion::_narrow (ftc2_base.in ()); if (CORBA::is_nil (ftc2.in ())) { @@ -195,27 +178,21 @@ Test_DynUnion::run_test (void) -1); } - ftc2->from_any (out_any2.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + ftc2->from_any (out_any2.in ()); - ftc2->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + ftc2->seek (1); s_out3 = ftc2->get_typecode (); - ACE_TRY_CHECK_EX (bad_kind); } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch (const CORBA::TypeCode::BadKind& ) { // Failed to create } - ACE_ENDTRY; if (!CORBA::is_nil (s_out3.in ())) { CORBA::Boolean const equal_tc = - s_out3->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); + s_out3->equal (data.m_typecode1); if (equal_tc) { @@ -272,8 +249,7 @@ Test_DynUnion::run_test (void) dp3->get_typecode (); CORBA::Boolean const equal_tc3 = - data.m_typecode1->equal (tc3.in () - ACE_ENV_ARG_PARAMETER); + data.m_typecode1->equal (tc3.in ()); if (!ACE_OS::strcmp (m_nm.in (), "tc") && tk == CORBA::tk_TypeCode @@ -292,11 +268,9 @@ Test_DynUnion::run_test (void) ftc1->set_to_default_member (); - ftc1->seek (1 - ACE_ENV_ARG_PARAMETER); + ftc1->seek (1); - ftc1->insert_short (data.m_short1 - ACE_ENV_ARG_PARAMETER); + ftc1->insert_short (data.m_short1); DynamicAny::DynAny_var mem = ftc1->member (); @@ -332,13 +306,11 @@ Test_DynUnion::run_test (void) // if we get here the create_dyn_any worked. } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynunion::run_test"); + ex._tao_print_exception ("test_dynunion::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp index 7180eff3205..0051d36e0c9 100644 --- a/TAO/tests/Explicit_Event_Loop/client.cpp +++ b/TAO/tests/Explicit_Event_Loop/client.cpp @@ -31,14 +31,12 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Check arguments. if (argc != 2) @@ -49,8 +47,7 @@ main (int argc, char *argv[]) } // Destringify argv[1]. - CORBA::Object_var obj = orb->string_to_object (argv[1] - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object (argv[1]); if (CORBA::is_nil (obj.in ())) { @@ -60,8 +57,7 @@ main (int argc, char *argv[]) } // Narrow. - Time_var tm = Time::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Time_var tm = Time::_narrow (obj.in ()); if (CORBA::is_nil (tm.in ())) { @@ -83,19 +79,17 @@ main (int argc, char *argv[]) tod.second)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "client: a CORBA exception occured"); + ex._tao_print_exception ("client: a CORBA exception occured"); return 1; } - ACE_CATCHALL + catch (...) { ACE_ERROR_RETURN ((LM_ERROR, "client: an unknown exception was caught\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 1f0dac851b3..c9501977326 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -59,7 +59,7 @@ parse_args (int argc, char *argv[]) TimeOfDay Time_impl:: -get_gmt ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +get_gmt () ACE_THROW_SPEC ((CORBA::SystemException)) { time_t time_now = time (0); @@ -85,14 +85,12 @@ void do_something_else() int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -101,12 +99,10 @@ main (int argc, char *argv[]) // Get reference to Root POA. CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = PortableServer::POA::_narrow (obj.in ()); // Activate POA manager. PortableServer::POAManager_var mgr @@ -120,8 +116,7 @@ main (int argc, char *argv[]) // Write its stringified reference to stdout. Time_var tm = time_servant._this (); - CORBA::String_var str = orb->object_to_string (tm.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var str = orb->object_to_string (tm.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", @@ -165,20 +160,18 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "server: a CORBA exception occured"); + ex._tao_print_exception ("server: a CORBA exception occured"); return 1; } - ACE_CATCHALL + catch (...) { ACE_ERROR_RETURN ((LM_ERROR, "%s\n", "client: an unknown exception was caught\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 1f2bd43626b..c4a63433eb6 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -21,21 +21,21 @@ Counter_Servant::~Counter_Servant (void) // Counter Interface Methods Implementation. void -Counter_Servant::increment (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::increment (/**/) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->count_; } CORBA::Long -Counter_Servant::get_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::get_count (/**/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->count_; } void -Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::reset (/**/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->count_ = 0; diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index 906f21ae8a2..2670017a27f 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -44,21 +44,17 @@ Policy_Tester::run (void) int Policy_Tester::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { // ORB Initialization. this->orb_ = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Get a reference to the RT-ORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); - this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()); // Here we parse the command line paramether passed // to the application. @@ -72,12 +68,12 @@ Policy_Tester::init (int argc, if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) { this->rt_poa_properties_ = - RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg); } else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = - RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) { @@ -144,16 +140,14 @@ Policy_Tester::create_objects (void) RTCORBA::Priority priority = this->rt_poa_properties_->priority (); poa_policy_list[0] = this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, - priority - ACE_ENV_ARG_PARAMETER); + priority); // Create priority Banded Connection Policy. RTCORBA::PriorityBands poa_priority_bands = this->rt_poa_properties_->priority_bands (); poa_policy_list[1] = - this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands); // Client Protocol Policy. RTCORBA::ProtocolList protocol_list; @@ -171,10 +165,10 @@ Policy_Tester::create_objects (void) this->rt_orb_->create_client_protocol_policy (protocol_list); CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); this->poa_ = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_mgr = PortableServer::POAManager::_nil (); @@ -182,17 +176,15 @@ Policy_Tester::create_objects (void) object = this->poa_->create_POA ("Child_POA", poa_mgr.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); this->child_poa_ = - RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (object.in ()); // 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); + this->child_poa_->create_reference ("IDL:Counter:1.0"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reference Created!\n"))); @@ -201,14 +193,14 @@ Policy_Tester::create_objects (void) "Unable to create Object!\n")) return -1; - Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Counter_var base_object = Counter::_narrow (object.in ()); if (!check_reference (base_object.in(), "Unable to create a Object!\n")) return -1; CORBA::String_var ior = - this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (base_object.in ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), ior.in ())); @@ -232,8 +224,7 @@ Policy_Tester::create_objects (void) object = this->child_poa_->create_reference_with_priority ("IDL:Counter:1.0", - this->rt_object_properties_->priority () - ACE_ENV_ARG_PARAMETER); + this->rt_object_properties_->priority ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reference Created!\n"))); @@ -242,7 +233,7 @@ Policy_Tester::create_objects (void) "Unable to create a Counter Object!\n")) return -1; - Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Counter_var over_object = Counter::_narrow (object.in ()); if (!check_reference (over_object.in(), "Unable to create Object!\n")) @@ -250,7 +241,7 @@ Policy_Tester::create_objects (void) CORBA::String_var o_ior = - this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (over_object.in ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), o_ior.in ())); @@ -270,5 +261,5 @@ Policy_Tester::create_objects (void) void Policy_Tester::shutdown (void) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 8561406b5b5..0f484518e18 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -39,8 +39,7 @@ public: // Runs the test. int init (int argc, - char *argv[] - ACE_ENV_ARG_DECL); + char *argv[]); void shutdown (void); private: diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 20a352ded22..422f0f198ae 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -19,11 +19,10 @@ Policy_Verifier::~Policy_Verifier (void) bool Policy_Verifier::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { this->orb_ = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); ACE_Arg_Shifter arg_shifter (argc, argv); @@ -34,14 +33,14 @@ Policy_Verifier::init (int argc, if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) { this->rt_poa_properties_ = - RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg); this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); } else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = - RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) { @@ -85,24 +84,23 @@ 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); + CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; - this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + this->base_object_ = Counter::_narrow (object.in ()); 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); + object = this->orb_->string_to_object (this->overridden_object_ref_); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; - this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + this->overridden_object_ = Counter::_narrow (object.in ()); if (!Policy_Verifier::check_reference (this->overridden_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) @@ -112,28 +110,24 @@ Policy_Verifier::init (int argc, } void -Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL ) +Policy_Verifier::run ( ) { this->verify_reference (this->base_object_.in (), - this->rt_poa_properties_ - ACE_ENV_ARG_PARAMETER); + this->rt_poa_properties_); this->verify_reference (this->overridden_object_.in (), - this->rt_object_properties_ - ACE_ENV_ARG_PARAMETER); + this->rt_object_properties_); } void Policy_Verifier::verify_reference (Counter_ptr object, - RT_Properties *rt_properties - ACE_ENV_ARG_DECL) + RT_Properties *rt_properties) { - ACE_TRY + try { CORBA::Policy_var policy_var = - object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE); if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n")) { @@ -163,16 +157,14 @@ Policy_Verifier::verify_reference (Counter_ptr object, ACE_TEXT ("Priority Value Mismatch.\n"))); } - policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE); if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Banded Policy\n")) { RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()); if (Policy_Verifier::check_reference (priority_banded_policy.in (), @@ -207,14 +199,13 @@ Policy_Verifier::verify_reference (Counter_ptr object, } } } - policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE); 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); + RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in ()); RTCORBA::ProtocolList_var protocol_list = client_protocol_policy->protocols (); @@ -227,12 +218,11 @@ Policy_Verifier::verify_reference (Counter_ptr object, } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised"); + ex._tao_print_exception ("CORBA Exception Raised"); } - ACE_ENDTRY; } CORBA::Boolean diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h index b78926c289f..a37b8bf0396 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.h +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h @@ -41,16 +41,14 @@ public: ~Policy_Verifier (void); bool init (int argc, - char *argv[] - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + char *argv[]); void run (void); private: // -- Helper methods -- void verify_reference (Counter_ptr counter, - RT_Properties *rt_properties - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + RT_Properties *rt_properties); CORBA::Boolean check_reference (CORBA::Object_ptr object, const char *msg); diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 4a23c92f0f5..b284f3e2534 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -21,8 +21,7 @@ RT_Properties::~RT_Properties (void) } RT_Properties * -RT_Properties::read_from (const char *file_name - ACE_ENV_ARG_DECL) +RT_Properties::read_from (const char *file_name) { FILE *fp = ACE_OS::fopen (file_name, "r"); diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h index 35166b9d9fa..4fbc06beed0 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.h +++ b/TAO/tests/Exposed_Policies/RT_Properties.h @@ -29,8 +29,7 @@ public: RT_Properties (void); ~RT_Properties (void); - static RT_Properties * read_from (const char *file_name - ACE_ENV_ARG_DECL); + static RT_Properties * read_from (const char *file_name); // -- Accessor Methods -- void priority (RTCORBA::Priority priority); diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index aaefc20f658..1295144a34c 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -15,13 +15,12 @@ int main (int argc, char *argv[]) { int status = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Policy_Verifier policy_verifier; - bool retval = policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER); + bool retval = policy_verifier.init (argc, argv); if (retval) { @@ -32,13 +31,12 @@ main (int argc, char *argv[]) status++; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised"); + ex._tao_print_exception ("CORBA Exception Raised"); status++; } - ACE_ENDTRY; return status; } diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index 6548d9ba6a8..59e4566d509 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -21,13 +21,12 @@ ACE_RCSID(tao, server, "$Id$") int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Policy_Tester policy_tester; - int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = policy_tester.init (argc, argv); if (result != 0) return result; @@ -35,14 +34,12 @@ main (int argc, char *argv[]) policy_tester.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("CORBA Exception Raised.")); + ex._tao_print_exception (ACE_TEXT ("CORBA Exception Raised.")); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index e236236fe5c..52fc9ed1247 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -27,8 +27,7 @@ public: void show (void); // Call show on all the window objects - void parse_args (int argc, char *argv[] - ACE_ENV_ARG_DECL); + void parse_args (int argc, char *argv[]); private: static void x_cb (Fl_Widget *widget, void* cookie); @@ -55,10 +54,10 @@ int main (int argc, char* argv[]) { TAO::FlResource_Loader fl_loader; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); Fl_Window window (300, 100); @@ -70,16 +69,15 @@ int main (int argc, char* argv[]) client.show (); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (argc, argv); Fl::run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -134,36 +132,33 @@ Client::y_cb (Fl_Widget*, void* cookie) void Client::x_changed (void) { - ACE_TRY_NEW_ENV + try { CORBA::Long x = CORBA::Long (this->x_roller_->value ()); - this->server_->set_x_angle (x ACE_ENV_ARG_PARAMETER); + this->server_->set_x_angle (x); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed"); + ex._tao_print_exception ("Client::x_changed"); } - ACE_ENDTRY; } void Client::y_changed (void) { - ACE_TRY_NEW_ENV + try { CORBA::Long y = CORBA::Long (this->y_roller_->value ()); - this->server_->set_y_angle (y ACE_ENV_ARG_PARAMETER); + this->server_->set_y_angle (y); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed"); + ex._tao_print_exception ("Client::x_changed"); } - ACE_ENDTRY; } void -Client::parse_args (int argc, char *argv[] - ACE_ENV_ARG_DECL) +Client::parse_args (int argc, char *argv[]) { const char *ior = "file://test.ior"; @@ -186,8 +181,8 @@ Client::parse_args (int argc, char *argv[] } CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); this->server_ = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); } diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index d0ae338f88d..e7ccab895fc 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -48,10 +48,10 @@ main (int argc, char *argv[]) window.end (); - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -62,7 +62,7 @@ main (int argc, char *argv[]) sw.show (); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,7 +70,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -81,7 +81,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -104,13 +104,11 @@ main (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index 649dc7a0a6e..ce5c85fec29 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -14,14 +14,14 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, } void -Simple_Server_i::set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::set_x_angle (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->set_x_angle (x); } void -Simple_Server_i::set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::set_y_angle (CORBA::Long y) ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->set_y_angle (y); diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index de8c1766c83..27f2249229f 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -62,9 +62,9 @@ public: // ctor // = The Simple_Server methods. - void set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) + void set_x_angle (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)); - void set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED) + void set_y_angle (CORBA::Long y) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index f7d2b63c058..30fc41d02de 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -68,13 +68,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,7 +82,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -93,10 +93,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -114,8 +114,7 @@ main (int argc, char *argv[]) for (int i = 0; i != niterations; ++i) { CORBA::Long r = - server->test_method (0, 0, callback.in () - ACE_ENV_ARG_PARAMETER); + server->test_method (0, 0, callback.in ()); if (r != 0) { @@ -127,42 +126,36 @@ main (int argc, char *argv[]) if (do_abort) { - ACE_TRY_EX(ABORT) + try { - server->shutdown_now (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(ABORT); + server->shutdown_now (0); } - ACE_CATCH (CORBA::COMM_FAILURE, comm_failure) + catch (const CORBA::COMM_FAILURE& comm_failure) { ACE_UNUSED_ARG (comm_failure); // Expected exception, continue.... } - ACE_ENDTRY; } else if (do_crash) { - ACE_TRY_EX(CRASH) + try { - server->shutdown_now (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(CRASH); + server->shutdown_now (1); } - ACE_CATCH (CORBA::COMM_FAILURE, comm_failure) + catch (const CORBA::COMM_FAILURE& comm_failure) { ACE_UNUSED_ARG (comm_failure); // Expected exception, continue.... } - ACE_ENDTRY; } else if (do_suicide) { - (void) server->test_method (1, 0, callback.in () - ACE_ENV_ARG_PARAMETER); + (void) server->test_method (1, 0, callback.in ()); 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); + (void) server->test_method (1, 1, callback.in ()); } if (do_shutdown) @@ -170,10 +163,10 @@ main (int argc, char *argv[]) server->shutdown (); } - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCH (CORBA::COMM_FAILURE, x) + catch (const CORBA::COMM_FAILURE& x) { // For other case this is expected. if (do_self_shutdown == 0) @@ -181,13 +174,11 @@ main (int argc, char *argv[]) x._tao_print_exception ("ERROR: Unexpected exception \n"); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 0ae08ed9f8b..fd50f9f9af2 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -49,13 +49,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -63,7 +63,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -74,10 +74,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -99,7 +99,7 @@ main (int argc, char *argv[]) middle_impl->_this (); CORBA::String_var ior = - orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (middle.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -120,16 +120,14 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in middle:"); + ex._tao_print_exception ("Exception caught in middle:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index 71d3c1899af..86045e54539 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -57,18 +57,15 @@ main (int argc, char *argv[]) CORBA::PolicyList policies; policies.length (2); policies[0] = - root_poa->create_lifespan_policy(PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy(PortableServer::PERSISTENT); policies[1] = - root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION); PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policies[0]->destroy (); policies[1]->destroy (); @@ -89,7 +86,7 @@ main (int argc, char *argv[]) server_impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -110,17 +107,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "ping - event loop finished\n")); - persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + persistent_poa->destroy (1, 1); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in ping:"); + ex._tao_print_exception ("Exception caught in ping:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index c11f773b4d3..a952dec9087 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -9,8 +9,7 @@ ACE_RCSID(Faults, test_i, "$Id$") void -PingObject_i::ping (PingObject_ptr callback - ACE_ENV_ARG_DECL) +PingObject_i::ping (PingObject_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)) { callback->pong (); @@ -26,7 +25,7 @@ void PingObject_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 43af7db0c98..00bdba4fee1 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -34,8 +34,7 @@ public: // ctor // = The PingObject interface methods - void ping (PingObject_ptr callback - ACE_ENV_ARG_DECL) + void ping (PingObject_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); void pong (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index f530bfb57c2..72c11191fd6 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -56,8 +56,7 @@ parse_args (int argc, char *argv[]) void run_client (CORBA::ORB_ptr orb, PingObject_ptr server, - PingObject_ptr callback - ACE_ENV_ARG_DECL) + PingObject_ptr callback) { // Run the client requests in a separate routine to isolate the // exceptions... @@ -66,13 +65,13 @@ run_client (CORBA::ORB_ptr orb, { ACE_Time_Value tv (0, 1000 * period); const char* reason = ""; - ACE_TRY + try { reason = "Exception during ping call"; - server->ping (callback ACE_ENV_ARG_PARAMETER); + server->ping (callback); // Run for <period> milliseconds, to receive the reply - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Terminate the client if: // - This is the last iteration @@ -85,41 +84,40 @@ run_client (CORBA::ORB_ptr orb, server->shutdown (); } } - ACE_CATCH (CORBA::TRANSIENT, t) + catch (const CORBA::TRANSIENT& t) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Ignoring transient exception\n")); // ACE_PRINT_EXCEPTION (t, reason); ACE_OS::sleep (tv); } - ACE_CATCH (CORBA::COMM_FAILURE, f) + catch (const CORBA::COMM_FAILURE& f) { ACE_DEBUG ((LM_DEBUG, "Ignoring comm failure exception\n")); // ACE_PRINT_EXCEPTION (f, reason); ACE_OS::sleep (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, reason); + ex._tao_print_exception (reason); ACE_OS::sleep (tv); } - ACE_ENDTRY; } } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -130,17 +128,14 @@ main (int argc, char *argv[]) CORBA::PolicyList policies; policies.length (2); policies[0] = - root_poa->create_lifespan_policy(PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy(PortableServer::PERSISTENT); policies[1] = - root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION); PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policies[0]->destroy (); policies[1]->destroy (); @@ -150,10 +145,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); PingObject_var server = - PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PingObject::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -173,20 +168,17 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it run_client (orb.in (), server.in (), - callback.in () - ACE_ENV_ARG_PARAMETER); + callback.in ()); - persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + persistent_poa->destroy (1, 1); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index e1b1b1a5551..aea56f47bf8 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -37,13 +37,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -75,7 +75,7 @@ main (int argc, char *argv[]) server_impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -96,15 +96,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server:"); + ex._tao_print_exception ("Exception caught in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index 2d1a6d4b599..30f89a0d7a3 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -11,8 +11,7 @@ ACE_RCSID(Failure, test_i, "$Id$") void -Callback_i::shutdown (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL) +Callback_i::shutdown (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) @@ -29,7 +28,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean #endif return; } - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); ACE_DEBUG ((LM_DEBUG, "Shutdown: Performed clean shutdown\n")); } @@ -39,15 +38,14 @@ Callback_i::shutdown (CORBA::Boolean is_clean CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback - ACE_ENV_ARG_DECL) + Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n", is_clean)); - callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER); + callback->shutdown (is_clean); } ACE_Time_Value tv (0, 20000); ACE_OS::sleep (tv); @@ -55,8 +53,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, } void -Simple_Server_i::shutdown_now (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL) +Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) @@ -71,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean } ACE_DEBUG ((LM_DEBUG, "shutdown_now:Performing clean shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } // **************************************************************** @@ -86,8 +83,7 @@ Simple_Server_i::shutdown (void) CORBA::Long Middle_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback - ACE_ENV_ARG_DECL) + Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)) { int i = 0; @@ -95,47 +91,42 @@ Middle_i::test_method (CORBA::Boolean do_callback, { this->server_->test_method (0, 0, - callback - ACE_ENV_ARG_PARAMETER); + callback); } this->server_->test_method (do_callback, is_clean, - callback - ACE_ENV_ARG_PARAMETER); + callback); for (; i != 10; ++i) { this->server_->test_method (0, 0, - callback - ACE_ENV_ARG_PARAMETER); + callback); } return 0; } void -Middle_i::shutdown_now (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL) +Middle_i::shutdown_now (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->server_->shutdown_now (is_clean ACE_ENV_ARG_PARAMETER); + this->server_->shutdown_now (is_clean); } void Middle_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { this->server_->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // ignore them } - ACE_ENDTRY; - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index 15d669f6b35..fd8310c07f4 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -32,8 +32,7 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL) + void shutdown (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -57,12 +56,10 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED) + Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown_now (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL_NOT_USED) + void shutdown_now (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -89,12 +86,10 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback - ACE_ENV_ARG_DECL_NOT_USED) + Callback_ptr callback) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown_now (CORBA::Boolean is_clean - ACE_ENV_ARG_DECL_NOT_USED) + void shutdown_now (CORBA::Boolean is_clean) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 82968309692..3622604315c 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -27,9 +27,8 @@ FileImpl::System::System (PortableServer::POA_ptr poa) // Create the Default Descriptor Servant fd_servant_ (poa) { - ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA - poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); + poa->set_servant (&this->fd_servant_); } FileImpl::System::~System (void) @@ -44,8 +43,7 @@ FileImpl::System::_default_POA (void) File::Descriptor_ptr FileImpl::System::open (const char *file_name, - CORBA::Long flags - ACE_ENV_ARG_DECL) + CORBA::Long flags) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -74,12 +72,11 @@ FileImpl::System::open (const char *file_name, // from ACE_HANDLE string CORBA::Object_var obj = this->poa_->create_reference_with_id (oid.in (), - "IDL:File/Descriptor:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:File/Descriptor:1.0"); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = - File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + File::Descriptor::_narrow (obj.in ()); return fd._retn (); @@ -114,31 +111,29 @@ FileImpl::Descriptor::fd (void) // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = - this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (me.in ()); // // Another way of getting our id. // PortableServer::ObjectId_var oid2 = - this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); + this->poa_->servant_to_id (this); // // Yet another way of getting our id. // int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0); // Get the POA Current object reference CORBA::Object_var obj = - orb->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("POACurrent"); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = - PortableServer::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (obj.in ()); PortableServer::ObjectId_var oid3 = poa_current->get_object_id (); @@ -155,8 +150,7 @@ FileImpl::Descriptor::fd (void) } CORBA::Long -FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer - ACE_ENV_ARG_DECL) +FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -174,8 +168,7 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer } File::Descriptor::DataBuffer * -FileImpl::Descriptor::read (CORBA::Long num_bytes - ACE_ENV_ARG_DECL) +FileImpl::Descriptor::read (CORBA::Long num_bytes) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -196,8 +189,7 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, - CORBA::Long whence - ACE_ENV_ARG_DECL) + CORBA::Long whence) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index c77d5cdd66f..1a6ba088622 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/File_i.h @@ -37,21 +37,18 @@ public: PortableServer::POA_ptr _default_POA (void); // Returns the default POA of this object - virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer - ACE_ENV_ARG_DECL) + virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // write buffer to File corresponding to this Descriptor - virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes - ACE_ENV_ARG_DECL) + virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes) ACE_THROW_SPEC ((CORBA::SystemException, // Reads num_bytes from the file and returns it File::IOError)); virtual CORBA::ULong lseek (CORBA::ULong offset, - CORBA::Long whence - ACE_ENV_ARG_DECL) + CORBA::Long whence) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // seek to the offset in file from whence @@ -84,8 +81,7 @@ public: //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, - CORBA::Long flags - ACE_ENV_ARG_DECL) + CORBA::Long flags) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // Opens a file ,creates a Descriptor reference with the diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index e27d088db8c..037b77a8fb1 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -80,53 +80,46 @@ parse_args (int argc, char **argv) } void -validate_connection (CORBA::Object_ptr object - ACE_ENV_ARG_DECL) +validate_connection (CORBA::Object_ptr object) { // Try to validate the connection several times, ignoring transient // exceptions. If the connection can still not be setup, return // failure. for (int i = 0; i < 100; ++i) { - ACE_TRY + try { object->_non_existent (); } - ACE_CATCH (CORBA::TRANSIENT, exception) + catch (const CORBA::TRANSIENT& ) { // Ignore... } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Rethrow any other exceptions. - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } static void * MTTEST (void *args) { - ACE_DECLARE_NEW_CORBA_ENV; ACE_CString &ior = *(ACE_CString*)args; - ACE_TRY + try { - CORBA::Object_var object = orb->string_to_object (ior.c_str () - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->string_to_object (ior.c_str ()); - validate_connection (object.in () - ACE_ENV_ARG_PARAMETER); + validate_connection (object.in ()); // Narrow the object reference to a File::System - File::System_var file_system = File::System::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + File::System_var file_system = File::System::_narrow (object.in ()); // Creat the file filename i.e "test" File::Descriptor_var fd = file_system->open (filename, - O_RDONLY - ACE_ENV_ARG_PARAMETER); + O_RDONLY); for( int i = 0; i < iterations; ++i) { @@ -135,23 +128,21 @@ MTTEST (void *args) ACE_DEBUG((LM_DEBUG,"Making request number %d\n",i)); #endif /*if 0*/ - fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER); + fd->lseek (0, SEEK_SET); // 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); + File::Descriptor::DataBuffer_var data_received = fd->read (128*1024); } // close the file fd->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main"); + ex._tao_print_exception ("Exception caught in main"); return 0; } - ACE_ENDTRY; return 0; } @@ -159,12 +150,11 @@ MTTEST (void *args) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB - orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, 0); // Parse the command-line arguments to get the IOR parse_args (argc, argv); @@ -202,12 +192,11 @@ main (int argc, char **argv) } ACE_Thread_Manager::instance()->wait(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main"); + ex._tao_print_exception ("Exception caught in main"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index e3f281db114..6099a4ca342 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -79,11 +79,10 @@ main (int argc, char *argv[]) ACE_OS::write (handle, "", 1); ACE_OS::close (handle); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0); int result = parse_args (argc, argv); if (result != 0) @@ -91,12 +90,11 @@ main (int argc, char *argv[]) // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Narrow the object reference to a POA reference PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -106,30 +104,29 @@ main (int argc, char *argv[]) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT); // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT); // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN); // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID); ACE_CString name = "firstPOA"; PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); for (CORBA::ULong i = 0; i < policies.length (); @@ -146,15 +143,14 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("FileSystem"); first_poa->activate_object_with_id (file_system_oid.in (), - &file_system_impl - ACE_ENV_ARG_PARAMETER); + &file_system_impl); CORBA::Object_var file_system = - first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER); + first_poa->id_to_reference (file_system_oid.in ()); // Get the IOR for the "FileSystem" object CORBA::String_var file_system_ior = - orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (file_system.in ()); ACE_DEBUG ((LM_DEBUG,"%s\n", file_system_ior.in ())); @@ -181,18 +177,17 @@ main (int argc, char *argv[]) worker.thr_mgr ()->wait (); - first_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + first_poa->destroy(1, 1); - root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy(1, 1); orb->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EXCEPTION CAUGHT"); + ex._tao_print_exception ("EXCEPTION CAUGHT"); return -1; } - ACE_ENDTRY; return 0; } @@ -208,19 +203,17 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Run the ORB for atmost 75 seconds ACE_Time_Value tv (75, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Worker::svc"); + ex._tao_print_exception ("Worker::svc"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index ae132dd5249..14aa76231d8 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -66,10 +66,10 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -84,7 +84,7 @@ main (int argc, char *argv[]) ACE_Time_Value tv (5, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Now run a test in the main thread, just to confuse matters a // little more. @@ -95,23 +95,21 @@ main (int argc, char *argv[]) if (do_shutdown) { CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); server->shutdown (); } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in main:"); + ex._tao_print_exception ("Exception caught in main:"); return 1; } - ACE_ENDTRY; return 0; } @@ -126,16 +124,14 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { this->run_test (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in thread (%t)\n"); + ex._tao_print_exception ("Exception caught in thread (%t)\n"); } - ACE_ENDTRY; return 0; } @@ -146,20 +142,20 @@ 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); + this->orb_->string_to_object (ior); CORBA::Boolean is_simple_server = - object->_is_a ("IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER); + object->_is_a ("IDL:Simple_Server:1.0"); if (!is_simple_server) ACE_DEBUG ((LM_DEBUG, "(%P|%t) unexpected result from _is_a()\n")); } CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -172,7 +168,7 @@ Worker::run_test (void) for (int i = 0; i != niterations; ++i) { CORBA::Boolean r = - server->test_is_a ("IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); + server->test_is_a ("IDL:Foo:1.0"); if (r != 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index 291eb881825..f1133b13c4e 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -65,18 +65,18 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); CORBA::Object_var table_object = - orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("IORTable"); IORTable::Table_var table = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); 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); + table->bind ("Simple_Server", ior.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -95,13 +95,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index 07410e40dbd..f133527feaf 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -9,8 +9,7 @@ ACE_RCSID(Forwarding, test_i, "$Id$") CORBA::Boolean -Simple_Server_i::test_is_a (const char * /* type */ - ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::test_is_a (const char * /* type */) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type)); @@ -21,5 +20,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h index f47f46095b3..36ea3f16ad1 100644 --- a/TAO/tests/Forwarding/test_i.h +++ b/TAO/tests/Forwarding/test_i.h @@ -31,7 +31,7 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean test_is_a (const char * type ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Boolean test_is_a (const char * type) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) 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 73f2c212aef..c8696ddd004 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp @@ -21,10 +21,9 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; // Now get the big replies.. - ACE_TRY + try { for (int i = 0; i != this->event_count_; ++i) { @@ -46,13 +45,11 @@ Client_Task::svc (void) // ACE_OS::sleep(tv); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception Caught \n"); + ex._tao_print_exception ("Exception Caught \n"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp index 85ae17ba6b1..857550b9eef 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp @@ -40,19 +40,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Big_Reply_var reply_gen = - Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Big_Reply::_narrow(tmp.in ()); if (CORBA::is_nil (reply_gen.in ())) { @@ -78,13 +78,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } 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 58e009fa9c2..a3f70b42eb9 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) } void -Payload_Receiver::more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) +Payload_Receiver::more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)) { @@ -24,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload { if (payload[i] != 'A') { - ACE_THROW (Test::Payload_Receiver::Invalid_Payload ()); + throw Test::Payload_Receiver::Invalid_Payload (); } } } @@ -34,7 +33,7 @@ void Payload_Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 d8e18b0686c..3ea7ab3acaa 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -20,8 +20,7 @@ public: Payload_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) + virtual void more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)); diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index 78d90dd7758..7205e3bf539 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -37,13 +37,13 @@ int main (int argc, char *argv[]) { int status = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -69,7 +69,7 @@ main (int argc, char *argv[]) payload_receiver_impl->_this (); CORBA::String_var ior = - orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (payload_receiver.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,17 +94,15 @@ main (int argc, char *argv[]) ++status; } - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); ++status; } - ACE_ENDTRY; return status; } 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 98efb9987b6..da443e12eab 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) } void -Payload_Receiver::more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) +Payload_Receiver::more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)) { @@ -24,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload { if (payload[i] != 'A') { - ACE_THROW (Test::Payload_Receiver::Invalid_Payload ()); + throw Test::Payload_Receiver::Invalid_Payload (); } } } @@ -34,7 +33,7 @@ void Payload_Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 36a6e98a37c..e48ab5b2b05 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -20,8 +20,7 @@ public: Payload_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void more_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) + virtual void more_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException, Test::Payload_Receiver::Invalid_Payload)); diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index 7a6aa3e16ad..6a56a1ab3c1 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -37,13 +37,13 @@ int main (int argc, char *argv[]) { int status = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -78,15 +78,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); PortableServer::ObjectId_var id = - persistent_poa->activate_object (payload_receiver_impl - ACE_ENV_ARG_PARAMETER); + persistent_poa->activate_object (payload_receiver_impl); CORBA::Object_var obj = - persistent_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + persistent_poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -111,17 +109,15 @@ main (int argc, char *argv[]) ++status; } - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); ++status; } - ACE_ENDTRY; return status; } diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index bd8775dd4c4..bbc4ffedbed 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -63,23 +63,19 @@ namespace Test virtual int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->h_->send_stuff ("Testing", - false - ACE_ENV_ARG_PARAMETER); + false); this->h_->send_stuff ("Testing", - false - ACE_ENV_ARG_PARAMETER); + false); this->h_->send_stuff ("Testing", - true - ACE_ENV_ARG_PARAMETER); + true); } - ACE_CATCH (CORBA::COMM_FAILURE, f) + catch (const CORBA::COMM_FAILURE& f) { ACE_UNUSED_ARG (f); ACE_DEBUG ((LM_DEBUG, @@ -90,7 +86,7 @@ namespace Test return 0; } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Caught CORBA Exception \n"); @@ -99,7 +95,7 @@ namespace Test return -1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Caught a C++ exception \n")); @@ -108,7 +104,6 @@ namespace Test return -1; } - ACE_ENDTRY; return 0; } @@ -126,9 +121,8 @@ namespace Test virtual int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown \n")); @@ -140,8 +134,7 @@ namespace Test // Start the timer profile_timer.start (); - this->o_->shutdown (blocked - ACE_ENV_ARG_PARAMETER); + this->o_->shutdown (blocked); // Stop the timer profile_timer.stop (); @@ -159,7 +152,7 @@ namespace Test return 0; } } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Caught exception during shutdown \n")); @@ -168,7 +161,6 @@ namespace Test "(%P|%t) Error in test \n")); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Returning from shutdown \n")); @@ -181,26 +173,22 @@ namespace Test static int try_main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) == false) return -1; CORBA::Object_var tmp = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Hang_var test = - Hang::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + Hang::_narrow (tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -232,21 +220,19 @@ namespace Test orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CORBA Exception caught \n"); + ex._tao_print_exception ("CORBA Exception caught \n"); ACE_ERROR ((LM_ERROR, "(%P|%t) Eror in test \n")); return -1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Error in test \n")); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 259e33b46c6..8484dce2280 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -12,23 +12,19 @@ namespace Test try_main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -48,8 +44,7 @@ namespace Test test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -71,18 +66,15 @@ namespace Test "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught CORBA exception \n"); + ex._tao_print_exception ("Caught CORBA exception \n"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h index 28f6ef82e23..706fc513fee 100644 --- a/TAO/tests/Hang_Shutdown/test_i.h +++ b/TAO/tests/Hang_Shutdown/test_i.h @@ -17,8 +17,7 @@ namespace Test public: // = The skeleton methods virtual void send_stuff (const char* str, - CORBA::Boolean flag - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Boolean flag) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index 65c22a9f8ed..3bb0a772b76 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp index e4569d3dcce..9f58a01ac0f 100644 --- a/TAO/tests/Hello/client.cpp +++ b/TAO/tests/Hello/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -68,13 +68,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index 5ec046e3b26..d54cee175d5 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index 17ab0efef4f..19e8544dde1 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -22,8 +22,7 @@ Hello::get_helloworld (void) CORBA::NO_MEMORY ()); PortableServer::ObjectId_var oid = - poa_->activate_object (hello_world - ACE_ENV_ARG_PARAMETER); + poa_->activate_object (hello_world); Test::HelloWorld_var hw = hello_world->_this (); return hw._retn (); @@ -33,5 +32,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index a38f0f1831e..5f1077eee9d 100644 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp @@ -41,19 +41,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow (tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -85,7 +85,7 @@ main (int argc, char *argv[]) } Test::HelloWorld_var hello_world = - Test::HelloWorld::_narrow (obj2.in () ACE_ENV_ARG_PARAMETER); + Test::HelloWorld::_narrow (obj2.in ()); if (CORBA::is_nil (hello_world.in ())) { @@ -104,13 +104,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index 7d00b4cfde7..9804e48bca5 100644 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index ce86ec57594..52b623edf02 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -89,20 +89,17 @@ main (int argc , char *argv[]) { int error_count = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); // Test of #pragma prefix behavior. @@ -345,16 +342,13 @@ main (int argc , char *argv[]) } root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in main"); + ex._tao_print_exception ("Unexpected exception in main"); return 1; } - ACE_ENDTRY; return error_count; } diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 875847f0afa..e47bdae2f2e 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -33,44 +33,38 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Retrieve the ORB. CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // ********************************************************************** // Get an object reference for the ORBs IORManipulation object! CORBA::Object_var IORM = - orb_->resolve_initial_references ("IORManipulation" - ACE_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("IORManipulation"); TAO_IOP::TAO_IOR_Manipulation_var iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () - ACE_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()); // ********************************************************************** // Create a few fictitious IORs CORBA::Object_var name1 = - orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz" - ACE_ENV_ARG_PARAMETER); + orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz"); CORBA::Object_var name2 = - orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz" - ACE_ENV_ARG_PARAMETER); + orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz"); // ********************************************************************** CORBA::String_var name1_ior = - orb_->object_to_string (name1.in () ACE_ENV_ARG_PARAMETER); + orb_->object_to_string (name1.in ()); 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); + orb_->object_to_string (name2.in ()); ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ())); // ********************************************************************** @@ -81,17 +75,16 @@ main (int argc, char *argv[]) iors [0] = name1; iors [1] = name2; - CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); + CORBA::Object_var merged = iorm->merge_iors (iors); CORBA::String_var merged_ior = - orb_->object_to_string (merged.in () ACE_ENV_ARG_PARAMETER); + orb_->object_to_string (merged.in ()); - CORBA::ULong count1 = iorm->get_profile_count (iors [0] ACE_ENV_ARG_PARAMETER); + CORBA::ULong count1 = iorm->get_profile_count (iors [0]); - CORBA::ULong count2 = iorm->get_profile_count (iors [1] ACE_ENV_ARG_PARAMETER); + CORBA::ULong count2 = iorm->get_profile_count (iors [1]); - CORBA::ULong count = iorm->get_profile_count (merged.in () - ACE_ENV_ARG_PARAMETER); + CORBA::ULong count = iorm->get_profile_count (merged.in ()); if (count != (count1 + count2)) ACE_DEBUG ((LM_ERROR, @@ -105,8 +98,7 @@ main (int argc, char *argv[]) // is_in_ior throws an exception if the intersection of the two // IORs is NULL. CORBA::ULong in_count = iorm->is_in_ior (merged.in (), - name1.in () - ACE_ENV_ARG_PARAMETER); + name1.in ()); if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -115,8 +107,7 @@ main (int argc, char *argv[]) in_count)); in_count = iorm->is_in_ior (merged.in (), - name2.in () - ACE_ENV_ARG_PARAMETER); + name2.in ()); if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -129,12 +120,12 @@ main (int argc, char *argv[]) // Verify ability to remove profiles from an IOR // First remove the second IOR from the merged IOR CORBA::Object_var just1 = - iorm->remove_profiles (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER); + iorm->remove_profiles (merged.in (), name2.in ()); CORBA::String_var just1_ior = - orb_->object_to_string (just1.in () ACE_ENV_ARG_PARAMETER); + orb_->object_to_string (just1.in ()); - count = iorm->get_profile_count (just1.in () ACE_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (just1.in ()); if (count1 != count) ACE_DEBUG ((LM_ERROR, @@ -146,7 +137,7 @@ main (int argc, char *argv[]) count, just1_ior.in ())); - in_count = iorm->is_in_ior (just1.in (), name1.in () ACE_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (just1.in (), name1.in ()); if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -158,16 +149,16 @@ 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); + iorm->add_profiles (just1.in (), name2.in ()); - count = iorm->get_profile_count (merged2.in () ACE_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (merged2.in ()); if (count != (count1 + count2)) ACE_DEBUG ((LM_ERROR, "**ERROR: add_profile failed profile count test!\n")); CORBA::String_var merged2_ior = - orb_->object_to_string (merged2.in () ACE_ENV_ARG_PARAMETER); + orb_->object_to_string (merged2.in ()); ACE_DEBUG ((LM_DEBUG, "\tAdding 2 back in IOR(%d) = %s\n", @@ -176,7 +167,7 @@ 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); + in_count = iorm->is_in_ior (merged2.in (), name1. in ()); if (count1 != in_count) ACE_DEBUG ((LM_ERROR, @@ -184,7 +175,7 @@ main (int argc, char *argv[]) "count bad (%d)!\n", in_count)); - in_count = iorm->is_in_ior (merged2.in (), name2.in () ACE_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (merged2.in (), name2.in ()); if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -194,12 +185,12 @@ main (int argc, char *argv[]) // ********************************************************************** CORBA::Object_var just2 = - iorm->remove_profiles (merged2.in (), name1.in () ACE_ENV_ARG_PARAMETER); + iorm->remove_profiles (merged2.in (), name1.in ()); CORBA::String_var just2_ior = - orb_->object_to_string (just2.in () ACE_ENV_ARG_PARAMETER); + orb_->object_to_string (just2.in ()); - count = iorm->get_profile_count (just2.in () ACE_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (just2.in ()); if (count2 != count) ACE_DEBUG ((LM_ERROR, @@ -209,7 +200,7 @@ main (int argc, char *argv[]) count, just2_ior.in ())); - in_count = iorm->is_in_ior (just2.in (), name2.in () ACE_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (just2.in (), name2.in ()); if (count2 != in_count) ACE_DEBUG ((LM_ERROR, @@ -221,16 +212,15 @@ main (int argc, char *argv[]) Status = 1; // 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); + in_count = iorm->is_in_ior (just2.in (), name1.in ()); } - ACE_CATCH (TAO_IOP::EmptyProfileList, userex) + catch (const TAO_IOP::EmptyProfileList& userex) { - ACE_PRINT_EXCEPTION (userex, - "Unexpected EmptyProfileList Exception!\n"); + userex._tao_print_exception ("Unexpected EmptyProfileList Exception!\n"); return -1; } - ACE_CATCH (TAO_IOP::NotFound, userex) + catch (const TAO_IOP::NotFound& userex) { if (Status == 1) { @@ -248,36 +238,30 @@ main (int argc, char *argv[]) } else { - ACE_PRINT_EXCEPTION (userex, - "Unexpected NotFound Exception!\n"); + userex._tao_print_exception ("Unexpected NotFound Exception!\n"); return -1; } } - ACE_CATCH (TAO_IOP::Duplicate, userex) + catch (const TAO_IOP::Duplicate& userex) { - ACE_PRINT_EXCEPTION (userex, - "Unexpected Duplicate Exception!\n"); + userex._tao_print_exception ("Unexpected Duplicate Exception!\n"); return -1; } - ACE_CATCH (TAO_IOP::Invalid_IOR, userex) + catch (const TAO_IOP::Invalid_IOR& userex) { - ACE_PRINT_EXCEPTION (userex, - "Unexpected Invalid_IOR Exception!\n"); + userex._tao_print_exception ("Unexpected Invalid_IOR Exception!\n"); return -1; } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, - "Unexpected system Exception!!\n"); + sysex._tao_print_exception ("Unexpected system Exception!!\n"); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected ACE_CATCHANY Exception!\n"); + ex._tao_print_exception ("Unexpected CORBA Exception!\n"); return -1; } - ACE_ENDTRY; if (Status == 1) { diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp index 1acd35bbb9e..afeda84afa9 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp @@ -14,15 +14,15 @@ ACE_RCSID (IOR_Endpoint_Hostnames, generate_ior, "$Id$") int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var rp = - PortableServer::POA::_narrow(poa_object.in() ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow(poa_object.in()); if (CORBA::is_nil (rp.in())) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) panic: nil root poa\n"), 1); @@ -30,18 +30,17 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(bogus_impl); Test::bogus_var b = bogus_impl->_this(); CORBA::String_var ior = - orb->object_to_string (b.in() ACE_ENV_ARG_PARAMETER); + orb->object_to_string (b.in()); printf ("%s\n", ior.in()); orb->shutdown(); orb->destroy(); } - ACE_CATCH (CORBA::Exception, e) + catch (const CORBA::Exception& e) { - ACE_PRINT_EXCEPTION (e, "Caught exception:"); + e._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp index 65c22a9f8ed..3bb0a772b76 100644 --- a/TAO/tests/IPV6/Hello.cpp +++ b/TAO/tests/IPV6/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp index aed3c55b373..436ff516b0b 100644 --- a/TAO/tests/IPV6/client.cpp +++ b/TAO/tests/IPV6/client.cpp @@ -43,19 +43,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -75,23 +75,21 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { if (expect_error) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - expected exception occurred!\n%s\n", - ACE_ANY_EXCEPTION._info().c_str())); + ex._info().c_str())); return 0; } else { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } } - ACE_ENDTRY; if (expect_error) { diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index 245c288e5c8..8c998950dd3 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 939d8a94ccc..e85e052248e 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -13,14 +13,12 @@ main (int argc, char *argv[]) { int i = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Retrieve a reference to the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); if (argc < 2) { @@ -67,7 +65,7 @@ main (int argc, char *argv[]) } else { - objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER); + objref = orb->resolve_initial_references (argv[i]); if (CORBA::is_nil (objref.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,8 +73,7 @@ main (int argc, char *argv[]) "given name.\n"), -1); - INS_var server = INS::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + INS_var server = INS::_narrow (objref.in ()); CORBA::String_var iorstr = orb->object_to_string (server.in ()); @@ -94,16 +91,15 @@ main (int argc, char *argv[]) } } } - ACE_CATCH (CORBA::ORB::InvalidName, name) + catch (const CORBA::ORB::InvalidName& ) { ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[i])); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:"); + ex._tao_print_exception ("Exception:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp index c01a35c05f7..8fbb39a0bad 100644 --- a/TAO/tests/InterOp-Naming/INS_test_server.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp @@ -13,28 +13,26 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tINS test server\n\n")); - ACE_TRY_NEW_ENV + try { if (server.init (argc, - argv - ACE_ENV_ARG_PARAMETER) == -1) + argv) == -1) return 1; else { server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index 895a5905a55..1e009356363 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -68,7 +68,7 @@ Server_i::parse_args (void) int Server_i::add_IOR_to_table (CORBA::String_var ior) { - ACE_TRY_NEW_ENV + try { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -78,19 +78,17 @@ Server_i::add_IOR_to_table (CORBA::String_var ior) CORBA::Object_var table_object = this->orb_manager_.orb ()->resolve_initial_references ( - "IORTable" - ACE_ENV_ARG_PARAMETER); + "IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); - adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER); + adapter->bind (this->ins_, ior.in ()); } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION (ex, "Exception caugh in add_IOR_to_table"); + ex._tao_print_exception ("Exception caugh in add_IOR_to_table"); } - ACE_ENDTRY; return 0; } @@ -98,15 +96,13 @@ Server_i::add_IOR_to_table (CORBA::String_var ior) // Initialize the server. int Server_i::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. int result = this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -127,12 +123,11 @@ Server_i::init (int argc, // Stash our ORB pointer for later reference. this->servant_.orb (orb.in ()); - ACE_TRY + try { CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("INS_servant", - &this->servant_ - ACE_ENV_ARG_PARAMETER); + &this->servant_); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", @@ -153,12 +148,12 @@ Server_i::init (int argc, } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException in activation of POA"); + ex._tao_print_exception ( + "\tException in activation of POA"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index b0f8311a91d..389456aa47a 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -37,8 +37,7 @@ public: // Destructor. int init (int argc, - char *argv[] - ACE_ENV_ARG_DECL); + char *argv[]); // Initialize the Server state - parsing arguments and waiting. int add_IOR_to_table (CORBA::String_var ior); diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 99d64446409..8fb575a16be 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -110,9 +110,8 @@ public: int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { u_long work_from_this_thread = 0; ACE_Time_Value sleep_for_this_thread; @@ -135,8 +134,7 @@ public: "Client: Invoking server from thread %t for time %d @ %T\n", work_from_this_thread)); - CORBA::ULong result = this->test_->method (work_from_this_thread - ACE_ENV_ARG_PARAMETER); + CORBA::ULong result = this->test_->method (work_from_this_thread); if (work_from_this_thread != result) { @@ -147,13 +145,11 @@ public: ACE_DEBUG ((LM_DEBUG, "Client: client loop finished for thread %t @ %T\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in thread:"); + ex._tao_print_exception ("Exception caught in thread:"); return -1; } - ACE_ENDTRY; return 0; @@ -184,9 +180,8 @@ public: int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { u_long event_loop_timeout_for_this_thread = 0; @@ -204,17 +199,15 @@ public: ACE_Time_Value timeout (0, event_loop_timeout_for_this_thread * 1000); - this->orb_->run (timeout ACE_ENV_ARG_PARAMETER); + this->orb_->run (timeout); ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in thread:"); + ex._tao_print_exception ("Exception caught in thread:"); return -1; } - ACE_ENDTRY; return 0; @@ -234,16 +227,14 @@ private: int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -252,11 +243,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); + orb->string_to_object (IOR); // Try to narrow the object reference to a <server> reference. - test_var server = test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test_var server = test::_narrow (object.in ()); Client_Task client_task (server.in ()); @@ -289,13 +279,11 @@ main (int argc, char **argv) server->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 1457d869a3c..dd25883f9b4 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -54,19 +54,16 @@ public: int svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in thread:"); + ex._tao_print_exception ("Exception caught in thread:"); return -1; } - ACE_ENDTRY; return 0; @@ -80,21 +77,18 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -110,8 +104,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -137,16 +130,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server: Event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index e67c5e68023..b2794eac59e 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -14,13 +14,11 @@ void test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } CORBA::ULong -test_i::method (CORBA::ULong work - ACE_ENV_ARG_DECL_NOT_USED) +test_i::method (CORBA::ULong work) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h index e2f04aeb71d..bee80a1826a 100644 --- a/TAO/tests/Leader_Followers/test_i.h +++ b/TAO/tests/Leader_Followers/test_i.h @@ -25,8 +25,7 @@ public: // ctor. // = The test interface methods. - CORBA::ULong method (CORBA::ULong work - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong method (CORBA::ULong work) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 2ef6f261718..d3cc973272b 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -10,25 +10,21 @@ ACE_RCSID (LongUpcalls, "$Id$") static void -validate_connection (Test::Controller_ptr controller - ACE_ENV_ARG_DECL) +validate_connection (Test::Controller_ptr controller) ACE_THROW_SPEC (()) { - ACE_TRY + try { #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::PolicyList_var unused; - controller->_validate_connection (unused - ACE_ENV_ARG_PARAMETER); + controller->_validate_connection (unused); #else - controller->_is_a ("Not_an_IDL_Type" - ACE_ENV_ARG_PARAMETER); + controller->_is_a ("Not_an_IDL_Type"); #endif } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb) @@ -39,14 +35,12 @@ AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb) void AMI_Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller - ACE_ENV_ARG_DECL) + Test::Controller_ptr controller) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; - validate_connection(controller - ACE_ENV_ARG_PARAMETER); + validate_connection(controller); // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count)); Worker worker (&thread_manager, @@ -62,7 +56,7 @@ void AMI_Manager::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } // **************************************************************** @@ -82,8 +76,7 @@ int Worker::svc (void) { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_SYNCH_MUTEX mutex; int pending_requests = 2; @@ -100,38 +93,33 @@ Worker::svc (void) handler = handler_impl->_this (); } - validate_connection(this->controller_.in() - ACE_ENV_ARG_PARAMETER); + validate_connection(this->controller_.in()); - this->controller_->sendc_worker_started (handler.in () - ACE_ENV_ARG_PARAMETER); + this->controller_->sendc_worker_started (handler.in ()); // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); ACE_Time_Value tv (0, 1000 * this->milliseconds_); ACE_OS::sleep (tv); - this->controller_->sendc_worker_finished (handler.in () - ACE_ENV_ARG_PARAMETER); + this->controller_->sendc_worker_finished (handler.in ()); // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); for (;;) { ACE_Time_Value tv (0, 1000 * this->milliseconds_); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); if (pending_requests == 0) break; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in svc() method\n"); + ex._tao_print_exception ("Exception in svc() method\n"); } - ACE_ENDTRY; return 0; } @@ -154,21 +142,18 @@ Controller_Handler::worker_started (void) void Controller_Handler::worker_started_excep - (::Messaging::ExceptionHolder* h - ACE_ENV_ARG_DECL) + (::Messaging::ExceptionHolder* h) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { h->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Controller_Handler exception raised in" - " worker_started"); + ex._tao_print_exception ( + "Controller_Handler exception raised in"" worker_started"); } - ACE_ENDTRY; } void @@ -181,19 +166,16 @@ Controller_Handler::worker_finished (void) void Controller_Handler::worker_finished_excep - (::Messaging::ExceptionHolder *h - ACE_ENV_ARG_DECL) + (::Messaging::ExceptionHolder *h) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { h->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Controller_Handler exception raised in" - " worker_finished"); + ex._tao_print_exception ( + "Controller_Handler exception raised in"" worker_finished"); } - ACE_ENDTRY; } diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 36236d5b35b..271f1d5b4c3 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -16,8 +16,7 @@ public: // = The skeleton methods virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller - ACE_ENV_ARG_DECL) + Test::Controller_ptr controller) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -63,13 +62,11 @@ public: virtual void worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_started_excep (::Messaging::ExceptionHolder* - ACE_ENV_ARG_DECL) + virtual void worker_started_excep (::Messaging::ExceptionHolder*) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished_excep (::Messaging::ExceptionHolder* - ACE_ENV_ARG_DECL) + virtual void worker_finished_excep (::Messaging::ExceptionHolder*) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index 3cb9d08d740..8d2f8d8442a 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -10,25 +10,21 @@ ACE_RCSID (LongUpcalls, "$Id$") static void -validate_connection (Test::Controller_ptr controller - ACE_ENV_ARG_DECL) +validate_connection (Test::Controller_ptr controller) ACE_THROW_SPEC (()) { - ACE_TRY + try { #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::PolicyList_var unused; - controller->_validate_connection (unused - ACE_ENV_ARG_PARAMETER); + controller->_validate_connection (unused); #else - controller->_is_a ("Not_an_IDL_Type" - ACE_ENV_ARG_PARAMETER); + controller->_is_a ("Not_an_IDL_Type"); #endif } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } Manager::Manager (CORBA::ORB_ptr orb) @@ -39,14 +35,12 @@ Manager::Manager (CORBA::ORB_ptr orb) void Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller - ACE_ENV_ARG_DECL) + Test::Controller_ptr controller) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; - validate_connection(controller - ACE_ENV_ARG_PARAMETER); + validate_connection(controller); // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count)); Worker worker (&thread_manager, @@ -61,7 +55,7 @@ void Manager::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } @@ -80,11 +74,9 @@ int Worker::svc (void) { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - validate_connection(this->controller_.in() - ACE_ENV_ARG_PARAMETER); + validate_connection(this->controller_.in()); this->controller_->worker_started (); @@ -97,11 +89,9 @@ Worker::svc (void) // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in svc() method\n"); + ex._tao_print_exception ("Exception in svc() method\n"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 78c75c5b519..313c0be7b06 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -18,8 +18,7 @@ public: // = The skeleton methods virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller - ACE_ENV_ARG_DECL) + Test::Controller_ptr controller) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp index a005874b6ee..49964f970a9 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.cpp +++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp @@ -17,35 +17,29 @@ void Manager_Handler::start_workers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { this->manager_->start_workers (CORBA::Short(10), CORBA::Long(1000), - this->controller_.in () - ACE_ENV_ARG_PARAMETER); + this->controller_.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised in nested start workers: "); + ex._tao_print_exception ("Exception raised in nested start workers: "); } - ACE_ENDTRY; } void -Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder - ACE_ENV_ARG_DECL) +Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { holder->raise_exception (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised in asynch start workers: "); + ex._tao_print_exception ("Exception raised in asynch start workers: "); } - ACE_ENDTRY; } diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index 9dbc6426118..9899fa0b440 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -19,8 +19,7 @@ public: // = The skeleton methods virtual void start_workers (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start_workers_excep (::Messaging::ExceptionHolder *holder - ACE_ENV_ARG_DECL) + virtual void start_workers_excep (::Messaging::ExceptionHolder *holder) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 790594ef9be..73bddabb7ae 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -63,10 +63,10 @@ main (int argc, char *argv[]) Test::Controller_var controller = controller_impl._this (); - object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior); Test::Manager_var manager = - Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Manager::_narrow (object.in ()); if (CORBA::is_nil (manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,27 +84,24 @@ main (int argc, char *argv[]) manager->sendc_start_workers (handler.in (), worker_count, CORBA::Long (1000), - controller.in () - ACE_ENV_ARG_PARAMETER); + controller.in ()); ACE_Time_Value tv (30, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); controller_impl.dump_results (); manager->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 749ec6befa5..5217b89ccf7 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -35,13 +35,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -49,7 +49,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -63,7 +63,7 @@ main (int argc, char *argv[]) manager_impl._this (); CORBA::String_var ior = - orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (manager.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,17 +81,15 @@ main (int argc, char *argv[]) // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index a63580bb2a8..1321790d3fd 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -35,13 +35,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -49,7 +49,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -62,10 +62,10 @@ main (int argc, char *argv[]) Test::Controller_var controller = controller_impl._this (); - object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior); Test::Manager_var manager = - Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Manager::_narrow (object.in ()); if (CORBA::is_nil (manager.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -78,24 +78,21 @@ main (int argc, char *argv[]) const CORBA::Short worker_count = 10; manager->start_workers (worker_count, CORBA::Long (1000), - controller.in () - ACE_ENV_ARG_PARAMETER); + controller.in ()); controller_impl.dump_results (); manager->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index 7abf137233f..80e6b304e2e 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -35,13 +35,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -49,7 +49,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -63,7 +63,7 @@ main (int argc, char *argv[]) manager_impl._this (); CORBA::String_var ior = - orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (manager.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -81,17 +81,15 @@ main (int argc, char *argv[]) // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index ad38e154796..10cd0cb76f8 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -49,49 +49,46 @@ parse_args (int argc, char *argv[]) } void -run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL); +run_test (Simple_Server_ptr server); int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; // Primary server CORBA::Object_var object_primary = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); //Secondary server CORBA::Object_var object_secondary = - orb->string_to_object (name ACE_ENV_ARG_PARAMETER); + orb->string_to_object (name); // 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); + 0); TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM); TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); iors [0] = object_primary; iors [1] = object_secondary; - CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); + CORBA::Object_var merged = iorm->merge_iors (iors); // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (merged.in ()); if (CORBA::is_nil (server.in ())) { @@ -101,23 +98,21 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n"); + ex._tao_print_exception ("Caught an exception \n"); return -1; } - ACE_ENDTRY; return 0; } -void run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL) +void run_test (Simple_Server_ptr server) { for (int loop = 0; loop < 10; loop++) { - ACE_TRY + try { // Make a remote call CORBA::Long ret = @@ -127,11 +122,11 @@ void run_test (Simple_Server_ptr server ACE_OS::sleep (25); } - ACE_CATCH (CORBA::TRANSIENT, t) + catch (const CORBA::TRANSIENT& t) { if (t.completed () != CORBA::COMPLETED_NO) { - ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT"); + t._tao_print_exception ("Unexpected kind of TRANSIENT"); } else { @@ -142,18 +137,16 @@ void run_test (Simple_Server_ptr server ACE_OS::sleep (1); } } - ACE_CATCH (CORBA::COMM_FAILURE, f) + catch (const CORBA::COMM_FAILURE& f) { - ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE"); + f._tao_print_exception ("A (sort of) expected COMM_FAILURE"); ACE_DEBUG ((LM_DEBUG, "Automagically re-issuing request on COMM_FAILURE\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception"); - ACE_RE_THROW; + ex._tao_print_exception ("Unexpected exception"); + throw; } - ACE_ENDTRY; } } diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index e295abdc30a..d9183ecd421 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -37,13 +37,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -68,7 +68,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -90,17 +90,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); ACE_OS::sleep (5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index 8e3a5b40b2d..f32e9f89571 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -54,51 +54,48 @@ parse_args (int argc, char *argv[]) } CORBA::ULongLong -run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL); +run_test (Simple_Server_ptr server); int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; // Primary server CORBA::Object_var object_primary = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); //Secondary server CORBA::Object_var object_secondary = - orb->string_to_object (name ACE_ENV_ARG_PARAMETER); + orb->string_to_object (name); // 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); + 0); TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM); TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); iors [0] = object_primary; iors [1] = object_secondary; - CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); + CORBA::Object_var merged = iorm->merge_iors (iors); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); CORBA::Any timeout_as_any; @@ -109,13 +106,11 @@ main (int argc, char *argv[]) policy_list[0] = orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE, - timeout_as_any - ACE_ENV_ARG_PARAMETER); + timeout_as_any); policy_current->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); for (CORBA::ULong l = 0; @@ -127,7 +122,7 @@ main (int argc, char *argv[]) // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (merged.in ()); if (CORBA::is_nil (server.in ())) { @@ -138,7 +133,7 @@ main (int argc, char *argv[]) } CORBA::ULongLong freq = - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); if (freq != 919263) ACE_ERROR ((LM_ERROR, @@ -150,19 +145,17 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n"); + ex._tao_print_exception ("Caught an exception \n"); return -1; } - ACE_ENDTRY; return 0; } CORBA::ULongLong -run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL) +run_test (Simple_Server_ptr server) { return server->remote_call (); } diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp index 68d4fe10942..5da4cc7726c 100644 --- a/TAO/tests/MProfile_Connection_Timeout/server.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp @@ -41,13 +41,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,7 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -72,7 +72,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -98,15 +98,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index 07a9376ceeb..d7b72b9d388 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -53,16 +53,14 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; Manager manager; - ACE_TRY + try { // Initilaize the ORB, POA etc. manager.init (argc, - argv - ACE_ENV_ARG_PARAMETER); + argv); if (parse_args (argc, argv) == -1) return -1; @@ -73,13 +71,11 @@ main (int argc, manager.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught"); + ex._tao_print_exception ("Caught"); return -1; } - ACE_ENDTRY; return 0; } @@ -93,21 +89,19 @@ Manager::Manager (void) int Manager::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj_var = - this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = - PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj_var.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = @@ -122,31 +116,26 @@ Manager::init (int argc, // The next two policies are common to both // Id Assignment Policy policies[0] = - root_poa_var->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa_var->create_id_assignment_policy (PortableServer::USER_ID); // Lifespan policy policies[1] = - root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT); // 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); + root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); // Servant Retention Policy -> Use a locator policies[3] = - root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN - ACE_ENV_ARG_PARAMETER); + root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN); ACE_CString name = "newPOA"; new_poa_var_ = root_poa_var->create_POA (name.c_str (), poa_manager_var.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -173,8 +162,7 @@ Manager::activate_servant (void) // Set ServantLocator object as the servant Manager of // secondPOA. - this->new_poa_var_->set_servant_manager (this->servant_locator_ - ACE_ENV_ARG_PARAMETER); + this->new_poa_var_->set_servant_manager (this->servant_locator_); // Try to create a reference with user created ID in new_poa // which uses ServantLocator. @@ -184,7 +172,7 @@ Manager::activate_servant (void) 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); + "IDL:Simple_Server:1.0"); return 0; } @@ -195,30 +183,26 @@ Manager::make_iors_register (void) { // First server CORBA::Object_var object_primary = - this->orb_->string_to_object (first_ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (first_ior); //Second server CORBA::Object_var object_secondary = - this->orb_->string_to_object (second_ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (second_ior); if (third_ior == 0) ACE_DEBUG ((LM_DEBUG, "Here is the culprit \n")); // Third Server CORBA::Object_var object_tertiary = - this->orb_->string_to_object (third_ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (third_ior); // 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); + 0); TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM); // Create the list @@ -230,7 +214,7 @@ Manager::make_iors_register (void) // Create a merged set 1; CORBA::Object_var merged_set1 = - iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); + iorm->merge_iors (iors); if (object_secondary.in () == 0) ACE_DEBUG ((LM_DEBUG, @@ -248,7 +232,7 @@ Manager::make_iors_register (void) // Create merged set 2 CORBA::Object_var merged_set2 = - iorm->merge_iors (iors_again ACE_ENV_ARG_PARAMETER); + iorm->merge_iors (iors_again); CORBA::String_var iorref1 = this->orb_->object_to_string (merged_set1.in ()); diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h index f84401427cf..03a1fa9371e 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.h +++ b/TAO/tests/MProfile_Forwarding/Manager.h @@ -13,8 +13,7 @@ class Manager // Ctor int init (int argc, - char *argv[] - ACE_ENV_ARG_DECL); + char *argv[]); // Initialize the ORB, POA etc. diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index c3ed9260942..80edf3be437 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -43,8 +43,7 @@ PortableServer::Servant Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr /* poa_ptr */, const char * /*operation*/, - PortableServer::ServantLocator::Cookie & /* cookie */ - ACE_ENV_ARG_DECL) + PortableServer::ServantLocator::Cookie & /* cookie */) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -60,8 +59,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (this->objref_.in () - ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (this->objref_.in ()); ACE_DEBUG ((LM_DEBUG, "Got the narrowed secondary server too... \n")); @@ -80,8 +78,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr , const char *, PortableServer::ServantLocator::Cookie , - PortableServer::Servant - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index ac226fda180..8c717896577 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h @@ -39,8 +39,7 @@ public: virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, - PortableServer::ServantLocator::Cookie &the_cookie - ACE_ENV_ARG_DECL) + PortableServer::ServantLocator::Cookie &the_cookie) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -50,8 +49,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant - ACE_ENV_ARG_DECL) + PortableServer::Servant the_servant) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index b8a4919b495..ce340c6b243 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -35,18 +35,16 @@ parse_args (int argc, char *argv[]) } void -run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL); +run_test (Simple_Server_ptr server); int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return -1; @@ -62,7 +60,7 @@ main (int argc, char *argv[]) } Simple_Server_var server = - Simple_Server::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (objref.in ()); if (CORBA::is_nil (server.in ())) { @@ -71,23 +69,21 @@ main (int argc, char *argv[]) -1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n"); + ex._tao_print_exception ("Caught an exception \n"); return -1; } - ACE_ENDTRY; return 0; } -void run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL) +void run_test (Simple_Server_ptr server) { for (int loop = 0; loop < 10; loop++) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "About to make remote call \n")); @@ -105,26 +101,24 @@ void run_test (Simple_Server_ptr server server->shutdown (); ACE_OS::sleep (23); } - ACE_CATCH (CORBA::UserException, x) + catch (const CORBA::UserException& x) { - ACE_PRINT_EXCEPTION (x, "Caught an "); + x._tao_print_exception ("Caught an "); } - ACE_CATCH (CORBA::TRANSIENT, t) + catch (const CORBA::TRANSIENT& t) { - ACE_PRINT_EXCEPTION (t, "Caught Exception"); + t._tao_print_exception ("Caught Exception"); } - ACE_CATCH (CORBA::COMM_FAILURE, f) + catch (const CORBA::COMM_FAILURE& f) { - ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE"); + f._tao_print_exception ("A (sort of) expected COMM_FAILURE"); ACE_DEBUG ((LM_DEBUG, "Automagically re-issuing request on COMM_FAILURE\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception"); - ACE_RE_THROW; + ex._tao_print_exception ("Unexpected exception"); + throw; } - ACE_ENDTRY; } } diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index b973dc29da8..ef8ad0578e3 100644 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -37,13 +37,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -68,7 +68,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -90,17 +90,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); ACE_OS::sleep (5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp index 8564f9d98ef..f3661e9aa95 100644 --- a/TAO/tests/MT_BiDir/Client_Task.cpp +++ b/TAO/tests/MT_BiDir/Client_Task.cpp @@ -21,18 +21,15 @@ Client_Task::svc (void) // Wait for 2 minutes... ACE_Time_Value tv (60,0); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Client_Task::svc exception!!!\n"); + ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp index 5a3909f7a26..3be330a230d 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.cpp +++ b/TAO/tests/MT_BiDir/Receiver_i.cpp @@ -15,8 +15,7 @@ Receiver_i::Receiver_i (void) void -Receiver_i::receive_payload (const Receiver::Payload &payload - ACE_ENV_ARG_DECL_NOT_USED) +Receiver_i::receive_payload (const Receiver::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h index 189191d7861..ee0795c0a6c 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.h +++ b/TAO/tests/MT_BiDir/Receiver_i.h @@ -23,8 +23,7 @@ public: CORBA::Long get_event_count (void); // = The skeleton methods - virtual void receive_payload (const Receiver::Payload &payload - ACE_ENV_ARG_DECL) + virtual void receive_payload (const Receiver::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp index c27adf89fe6..712a2edfaf3 100644 --- a/TAO/tests/MT_BiDir/Sender_i.cpp +++ b/TAO/tests/MT_BiDir/Sender_i.cpp @@ -29,8 +29,7 @@ Sender_i::Sender_i (int no_clients, CORBA::Long -Sender_i::receiver_object (Receiver_ptr recv - ACE_ENV_ARG_DECL) +Sender_i::receiver_object (Receiver_ptr recv) ACE_THROW_SPEC ((CORBA::SystemException, Sender::Table_Full)) { @@ -64,6 +63,5 @@ Sender_i::send_message (void) int send_to = ACE_OS::rand () % this->no_clients_; - this->receivers_[send_to]->receive_payload (this->payload_ - ACE_ENV_ARG_PARAMETER); + this->receivers_[send_to]->receive_payload (this->payload_); } diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index b68d1c03525..06176105b41 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -24,8 +24,7 @@ public: ACE_Manual_Event &event); // = The skeleton methods - virtual CORBA::Long receiver_object (Receiver *recv - ACE_ENV_ARG_DECL) + virtual CORBA::Long receiver_object (Receiver *recv) ACE_THROW_SPEC ((CORBA::SystemException, Sender::Table_Full)); diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index 0112e68565d..c13aefd6fef 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/Server_Task.cpp @@ -42,9 +42,8 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Before start CORBA::ULong connection_no = @@ -73,12 +72,10 @@ Server_Task::svc (void) } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in iteration.\n"); + ex._tao_print_exception ("Caught exception in iteration.\n"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 2219a95abc5..f4a30f91d21 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -39,18 +39,17 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -71,8 +70,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -80,8 +78,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -94,12 +91,10 @@ main (int argc, char *argv[]) poa_manager->activate (); CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Sender_var sender = - Sender::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Sender::_narrow (object.in ()); if (CORBA::is_nil (sender.in ())) { @@ -121,8 +116,7 @@ main (int argc, char *argv[]) receiver->_this (); // Send the calback object to the server - sender->receiver_object (receiver_obj.in () - ACE_ENV_ARG_PARAMETER); + sender->receiver_object (receiver_obj.in ()); // Threads that will handle the call backs Client_Task client_task (orb.in (), @@ -143,16 +137,13 @@ main (int argc, char *argv[]) count)); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Catched exception:"); + ex._tao_print_exception ("Catched exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 4876eec1af4..78067bed264 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -57,17 +57,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -75,8 +74,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -89,8 +87,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -98,8 +95,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -122,16 +118,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (sender); PortableServer::ObjectId_var id = - child_poa->activate_object (sender - ACE_ENV_ARG_PARAMETER); + child_poa->activate_object (sender); CORBA::Object_var obj = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -171,7 +164,7 @@ main (int argc, char *argv[]) ACE_Time_Value tv (60, 0); // Call the ORB run from the main thread - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); } @@ -179,16 +172,13 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index aff218f1b77..9d4ee7cfd61 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -78,19 +78,19 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -118,13 +118,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -146,18 +144,18 @@ Client::validate_connection (void) // run on minimum CORBA builds too! for (int j = 0; j != 100; ++j) { - ACE_TRY + try { this->server_->test_method (); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } } int Client::svc (void) { - ACE_TRY_NEW_ENV + try { this->validate_connection (); @@ -170,11 +168,9 @@ Client::svc (void) i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client: exception raised"); + ex._tao_print_exception ("MT_Client: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index d9910efc06e..30ce55d8ec4 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -71,7 +71,7 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); @@ -80,10 +80,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -106,13 +106,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } @@ -129,8 +127,7 @@ Client::Client (int niterations, int Client::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (int i = 0; i < this->niterations_; ++i) { @@ -140,13 +137,13 @@ Client::svc (void) CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv"); char* argv[1] = { argv0.inout () }; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); + orb->string_to_object (this->ior_); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -161,11 +158,9 @@ Client::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client: exception raised"); + ex._tao_print_exception ("MT_Client: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index 39c7be71a69..099f923d977 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -64,7 +64,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,17 +87,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index 8d489b5a1a1..8b6b5696d99 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -18,5 +18,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index fafbba7f140..1c4a6ccf3cd 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -48,19 +48,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -73,7 +73,7 @@ main (int argc, char *argv[]) for (int i = 0; i != niterations; ++i) { CORBA::Long r = - server->test_method (i ACE_ENV_ARG_PARAMETER); + server->test_method (i); if (r != i) { @@ -88,13 +88,11 @@ main (int argc, char *argv[]) server->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 869e34a81bc..f81e2beb81f 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -63,13 +63,13 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -77,7 +77,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -91,7 +91,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -121,13 +121,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } @@ -142,14 +140,12 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index 9b86a943a1d..8bb3e551ecb 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -11,7 +11,7 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long -Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -25,5 +25,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h index a792141e72c..8934973a678 100644 --- a/TAO/tests/MT_Server/test_i.h +++ b/TAO/tests/MT_Server/test_i.h @@ -31,7 +31,7 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 0900694abce..436ff82a7e8 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -47,20 +47,18 @@ Client_Task::too_big_difference_calls (void) const int Client_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; int successful_calls = 0; int timed_out_calls = 0; - ACE_TRY + try { this->validate_connection (); CORBA::Object_var object = - this->orb_->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); TimeBase::TimeT timeout_period = 10 * this->timeout_; @@ -71,12 +69,10 @@ Client_Task::svc (void) policy_list.length (1); policy_list[0] = this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - timeout_as_any - ACE_ENV_ARG_PARAMETER); + timeout_as_any); policy_current->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); for (int i = 0; i != this->iterations_; ++i) { @@ -97,13 +93,11 @@ Client_Task::svc (void) #endif /* 0 */ } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); this->successful_calls_ += successful_calls; @@ -115,29 +109,27 @@ Client_Task::svc (void) void Client_Task::validate_connection (void) { - ACE_TRY + try { for (int i = 0; i != 100; ++i) { - (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); + (void) this->sleep_service_->go_to_sleep (0); } } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ) { // Ignore transient exceptions } - ACE_ENDTRY; } int Client_Task::one_iteration (void) { - ACE_TRY + try { ACE_Time_Value start = ACE_OS::gettimeofday (); - this->sleep_service_->go_to_sleep (this->sleep_time_ - ACE_ENV_ARG_PARAMETER); + this->sleep_service_->go_to_sleep (this->sleep_time_); ACE_Time_Value end = ACE_OS::gettimeofday (); @@ -181,18 +173,16 @@ Client_Task::one_iteration (void) return 1; } - ACE_CATCH(CORBA::TIMEOUT, to_exp) + catch (const CORBA::TIMEOUT& ) { // Ignore this exception, it is usually caused by a transient // condition return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp index f8e4e6b0379..62b99fc48ff 100644 --- a/TAO/tests/MT_Timeout/Server_Task.cpp +++ b/TAO/tests/MT_Timeout/Server_Task.cpp @@ -18,15 +18,13 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr, int Server_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER); + this->orb_->run (this->running_time_); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index 4e19c308db6..e3a26cfb38c 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -12,8 +12,7 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb) } void -Sleep_Service::go_to_sleep (CORBA::ULong microseconds - ACE_ENV_ARG_DECL_NOT_USED) +Sleep_Service::go_to_sleep (CORBA::ULong microseconds) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong secs = microseconds / 1000000; @@ -28,5 +27,5 @@ Sleep_Service::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index 8407220a7eb..c1bdd5a5d2d 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -17,8 +17,7 @@ public: Sleep_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void go_to_sleep (CORBA::ULong microseconds - ACE_ENV_ARG_DECL) + virtual void go_to_sleep (CORBA::ULong microseconds) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index 9ed794013b9..2ec81c8b442 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -48,19 +48,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Sleep_Service_var sleep_service = - Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Sleep_Service::_narrow(tmp.in ()); if (CORBA::is_nil (sleep_service.in ())) { @@ -92,7 +92,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Get back in sync with the server.. - sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); + sleep_service->go_to_sleep (0); sleep_service->shutdown (); @@ -143,13 +143,11 @@ main (int argc, char *argv[]) "expected for task 1\n")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 585b3cfe666..b1483d778f4 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -36,16 +36,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,7 +68,7 @@ main (int argc, char *argv[]) sleep_service_impl->_this (); CORBA::String_var ior = - orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (process.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -95,17 +95,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index 802b6d3d584..f24fa6be53b 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -20,28 +20,28 @@ Bottom_Impl::~Bottom_Impl (void) } char * -Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::top_quote ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::top); } char * -Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::left_quote ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::left); } char * -Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::right_quote ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::right); } char * -Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::bottom_quote ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::bottom); @@ -51,7 +51,7 @@ void Bottom_Impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } /////////////////////////////////////////////////////////// @@ -124,5 +124,5 @@ Delegated_Bottom_Impl::shutdown (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); this->delegate_->shutdown (); - //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + //this->orb_->shutdown (0); } diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp index c46d30c0406..0b2c982aa5c 100644 --- a/TAO/tests/Multiple/client.cpp +++ b/TAO/tests/Multiple/client.cpp @@ -6,17 +6,16 @@ ACE_RCSID (tests, client, "$Id$") int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO"); CORBA::Object_var object; // Get The IOR from a file - object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object ("file://s.ior"); if (CORBA::is_nil (object.in ())) { @@ -27,12 +26,11 @@ int main (int argc, char *argv[]) Collocation_Tester tester (object.in ()); tester.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised"); + ex._tao_print_exception ("CORBA Exception Raised"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index aec287512a3..01275412a9e 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -8,17 +8,16 @@ ACE_RCSID (tests, server, "$Id$") int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Orb Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO"); CORBA::Object_var object; - object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RootPOA"); - PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER); + PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in()); // Get the POAManager @@ -38,7 +37,7 @@ 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); + orb->object_to_string (bottom.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -58,11 +57,11 @@ int main (int argc, char *argv[]) orb->run(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Multiple Execution Interrupted Exception!\n"); + ex._tao_print_exception ( + "Multiple Execution Interrupted Exception!\n"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index 8ccf929918a..793dd8553d0 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -71,12 +71,10 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0); // Parse the command-line arguments to get the IOR parse_args (argc, argv); @@ -103,21 +101,21 @@ 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); + CORBA::Object_var object = orb->string_to_object (ior); CORBA::String_var string; // Narrow the object reference - A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + A_var a = A::_narrow (object.in ()); // Narrow the object reference - intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER); + intB_var b = intB::_narrow (a.in ()); // Narrow the object reference - C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER); + C_var c = C::_narrow (a.in ()); // Narrow the object reference - D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER); + D_var d = D::_narrow (c.in ()); string = a->method1 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -146,12 +144,11 @@ main (int argc, char **argv) string = d->method4 (); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client"); + ex._tao_print_exception ("client"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index 0bc9e14d7ef..bce1669808c 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -50,21 +50,18 @@ main (int argc, char **argv) TAO_ORB_Manager orb_manager; ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { orb_manager.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); if (parse_args (argc, argv) != 0) return -1; CORBA::String_var ior = orb_manager.activate_under_child_poa ("my_object", - &servant - ACE_ENV_ARG_PARAMETER); + &servant); ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ())); @@ -84,12 +81,11 @@ main (int argc, char **argv) orb_manager.run (); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 09c05cda7be..6a267a9487c 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -82,19 +82,19 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -122,13 +122,11 @@ main (int argc, char *argv[]) for (int c = 0; c < (niterations * 2); c++) { - ACE_TRY_EX (CORBALOC) + try { CORBA::Object_var probably_not_exist = - orb->string_to_object(corbaloc_arg - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(corbaloc_arg); - ACE_TRY_CHECK_EX (CORBALOC); if (CORBA::is_nil(probably_not_exist.in())) { @@ -137,9 +135,7 @@ main (int argc, char *argv[]) else { Simple_Server_var newserver = - Simple_Server::_narrow (probably_not_exist.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (CORBALOC); + Simple_Server::_narrow (probably_not_exist.in ()); // should throw an exception if (CORBA::is_nil(newserver.in())) @@ -152,11 +148,10 @@ main (int argc, char *argv[]) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // ACE_DEBUG ((LM_DEBUG, "caught exception\n", corbaloc_arg)); } - ACE_ENDTRY; } } ACE_DEBUG ((LM_DEBUG, @@ -174,13 +169,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -202,35 +195,33 @@ Client::validate_connection (void) // run on minimum CORBA builds too! for (int j = 0; j != 100; ++j) { - ACE_TRY + try { - this->server_->test_method (j ACE_ENV_ARG_PARAMETER); + this->server_->test_method (j); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } } int Client::svc (void) { - ACE_TRY_NEW_ENV + try { this->validate_connection (); for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (i ACE_ENV_ARG_PARAMETER); + this->server_->test_method (i); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client: exception raised"); + ex._tao_print_exception ("MT_Client: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 2317b82edfa..8e1279e4f2c 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -122,13 +122,13 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -136,7 +136,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -155,7 +155,7 @@ main (int argc, char *argv[]) server_impl->_this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -195,13 +195,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } @@ -216,16 +214,14 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value tv (140, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } @@ -249,30 +245,28 @@ SelfClient::validate_connection (void) for (int j = 0; j != 100; ++j) { - ACE_TRY + try { - this->server_->test_method (j ACE_ENV_ARG_PARAMETER); + this->server_->test_method (j); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } } int SelfClient::svc (void) { - ACE_TRY_NEW_ENV + try { this->validate_connection (); for (int i = 0; i < this->niterations_; ++i) { - ACE_TRY_EX (CORBALOC) + try { CORBA::Object_var probably_not_exist = - orb_->string_to_object (corbaloc_arg - ACE_ENV_ARG_PARAMETER); + orb_->string_to_object (corbaloc_arg); - ACE_TRY_CHECK_EX (CORBALOC); if (CORBA::is_nil (probably_not_exist.in())) { @@ -281,9 +275,7 @@ SelfClient::svc (void) else { Simple_Server_var newserver = - Simple_Server::_narrow (probably_not_exist.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (CORBALOC); + Simple_Server::_narrow (probably_not_exist.in ()); // should throw an exception if (CORBA::is_nil (newserver.in())) @@ -300,23 +292,19 @@ SelfClient::svc (void) } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_SelfClient: exception raised"); + ex._tao_print_exception ("MT_SelfClient: exception raised"); } - ACE_ENDTRY; // Just make a call - this->server_->test_method (i ACE_ENV_ARG_PARAMETER); + this->server_->test_method (i); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_SelfClient: exception raised"); + ex._tao_print_exception ("MT_SelfClient: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp index ab2a816fb2e..fb3f743d84d 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp @@ -12,7 +12,7 @@ ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp") CORBA::Long -Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -28,5 +28,5 @@ Simple_Server_i::shutdown (void) { // We dont shutdown the ORB. We allow the server to go away as it // wants. - // this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + // this->orb_->shutdown (0); } diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h index a792141e72c..8934973a678 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.h +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h @@ -31,7 +31,7 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Long x) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp index 548952c84fe..e83bea1f1d9 100644 --- a/TAO/tests/Muxing/Client_Task.cpp +++ b/TAO/tests/Muxing/Client_Task.cpp @@ -27,19 +27,17 @@ Client_Task::svc (void) for (CORBA::ULong j = 0; j != payload.length (); ++j) payload[j] = (j % 256); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (int i = 0; i != this->event_count_; ++i) { - this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER); + this->receiver_->receive_data (payload); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index f20a339cd74..051bbb2e124 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -24,8 +24,7 @@ Receiver::dump_results () } void -Receiver::receive_data (const Test::Payload &payload - ACE_ENV_ARG_DECL_NOT_USED) +Receiver::receive_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -45,5 +44,5 @@ void Receiver::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index 30fb08c40ea..8117eab65f2 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -28,8 +28,7 @@ public: void dump_results (void); // = The skeleton methods - virtual void receive_data (const Test::Payload &payload - ACE_ENV_ARG_DECL) + virtual void receive_data (const Test::Payload &payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Long get_event_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index 9cf0b292946..2bd40e20e75 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -17,8 +17,7 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if defined (ACE_OPENVMS) // OpenVMS typically takes a lot longer... @@ -27,13 +26,12 @@ Server_Task::svc (void) // run the test for at most 120 seconds... ACE_Time_Value tv (120, 0); #endif - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index c1638ce81f8..e436d187fa6 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -40,19 +40,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Receiver_var receiver = - Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Receiver::_narrow(tmp.in ()); if (CORBA::is_nil (receiver.in ())) { @@ -91,13 +91,11 @@ main (int argc, char *argv[]) } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index 0cf3c09e7de..7b2cdfe889a 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -68,7 +68,7 @@ main (int argc, char *argv[]) receiver_impl->_this (); CORBA::String_var ior = - orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (receiver.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -93,17 +93,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 67811435ae2..d5d40422f9a 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -89,7 +89,7 @@ main (int argc, char *argv[]) } catch (CORBA::SystemException &ex) { - ACE_PRINT_EXCEPTION (ex, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp index 6e41137344e..dbcbc127f0c 100644 --- a/TAO/tests/Native_Exceptions/server.cpp +++ b/TAO/tests/Native_Exceptions/server.cpp @@ -85,7 +85,7 @@ main (int argc, char *argv[]) } catch (CORBA::SystemException &ex) { - ACE_PRINT_EXCEPTION (ex, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } 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 f4ef1c9a440..475f8634d6e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -38,8 +38,7 @@ MT_Object_i::~MT_Object_i (void) CORBA::Long MT_Object_i::yadda (CORBA::Long hop_count, - MT_Object_ptr partner - ACE_ENV_ARG_DECL) + MT_Object_ptr partner) ACE_THROW_SPEC ((CORBA::SystemException)) { #if 0 @@ -52,8 +51,7 @@ MT_Object_i::yadda (CORBA::Long hop_count, { if (partner != 0) return partner->yadda (hop_count + 1, - this->_this () - ACE_ENV_ARG_PARAMETER) + 1; + this->_this ()) + 1; } return 0; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index de5d9893297..99ac8b12d2b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -36,8 +36,7 @@ public: // Destructor. virtual CORBA::Long yadda (CORBA::Long hop_count, - MT_Object_ptr partner - ACE_ENV_ARG_DECL) + MT_Object_ptr partner) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index 55af84d9d32..2c32f971f4b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -149,8 +149,7 @@ MT_Client::parse_args (void) int MT_Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (unsigned long i = 0; i < this->iterations_; i++) { @@ -164,17 +163,14 @@ MT_Client::run (void) // call the recursive object MT_Object for nested upcalls // testing this->mT_Object_var_->yadda (0, - 0 - ACE_ENV_ARG_PARAMETER); + 0); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client:run"); + ex._tao_print_exception ("MT_Client:run"); return -1; } - ACE_ENDTRY; return 0; } @@ -202,8 +198,7 @@ MT_Client::init (int argc, char **argv, this->client_number_ = client_number; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { char buf[64]; ACE_OS::sprintf (buf, "thread_%lx", reinterpret_cast<long> (this)); @@ -211,8 +206,7 @@ MT_Client::init (int argc, char **argv, this->orb_var_ = CORBA::ORB_init (this->argc_, this->argv_, - buf - ACE_ENV_ARG_PARAMETER); + buf); // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -225,16 +219,14 @@ 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); + this->orb_var_->string_to_object (this->object_key_); if (CORBA::is_nil (object_var.in())) ACE_ERROR_RETURN ((LM_ERROR, "No proper object has been returned.\n"), -1); - this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - ACE_ENV_ARG_PARAMETER); + this->mT_Object_var_ = MT_Object::_narrow (object_var.in()); if (CORBA::is_nil (this->mT_Object_var_.in())) { @@ -247,7 +239,7 @@ MT_Client::init (int argc, char **argv, ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n")); CORBA::Object_var poa_object = - this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_var_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -255,20 +247,18 @@ MT_Client::init (int argc, char **argv, 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); poa_manager->activate (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Client::init"); + ex._tao_print_exception ("MT_Client::init"); return -1; } - ACE_ENDTRY; return 0; } @@ -279,14 +269,12 @@ MT_Client::init (int argc, char **argv, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { TAO_ORB_Manager orb_manager; int r = orb_manager.init (argc, - argv - ACE_ENV_ARG_PARAMETER); + argv); if (r != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -345,11 +333,10 @@ main (int argc, char **argv) return result; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main"); + ex._tao_print_exception ("main"); } - ACE_ENDTRY; return 1; } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 0cd89b7d91e..9a6d581df91 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -145,15 +145,13 @@ MT_Server::init (int argc, "MT_Server::init: ORB_Manager is nil!\n"), -1); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_ptr_->init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); this->parse_args (); @@ -161,8 +159,7 @@ MT_Server::init (int argc, this->str_ = this->orb_manager_ptr_->activate_under_child_poa ("MT", - &this->mT_Object_i_ - ACE_ENV_ARG_PARAMETER); + &this->mT_Object_i_); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -187,16 +184,14 @@ MT_Server::init (int argc, CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb (); CORBA::Object_var object_var = - orb_var->string_to_object (this->object_key_ - ACE_ENV_ARG_PARAMETER); + orb_var->string_to_object (this->object_key_); if (CORBA::is_nil (object_var.in())) ACE_ERROR_RETURN ((LM_ERROR, "No proper object has been returned.\n"), -1); - this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - ACE_ENV_ARG_PARAMETER); + this->mT_Object_var_ = MT_Object::_narrow (object_var.in()); if (CORBA::is_nil (this->mT_Object_var_.in())) { @@ -208,12 +203,11 @@ MT_Server::init (int argc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::init"); + ex._tao_print_exception ("MT_Client::init"); return -1; } - ACE_ENDTRY; return 0; } @@ -221,8 +215,7 @@ MT_Server::init (int argc, int MT_Server::run () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int r = this->orb_manager_ptr_->run (); @@ -231,12 +224,11 @@ MT_Server::run () "MT_Server::run"), -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Server::run"); + ex._tao_print_exception ("MT_Server::run"); return -1; } - ACE_ENDTRY; return 0; } @@ -245,18 +237,15 @@ MT_Server::~MT_Server (void) if (this->object_key_ != 0) ACE_OS::free (this->object_key_); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (this->orb_manager_ptr_) - this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::~MT_Client"); + ex._tao_print_exception ("MT_Client::~MT_Client"); } - ACE_ENDTRY; } @@ -265,8 +254,7 @@ MT_Server::run_ORB_briefly (void) { if (this->iterations_ > 0) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "(%P|%t) MT_Server::run: " @@ -278,17 +266,14 @@ MT_Server::run_ORB_briefly (void) this->mT_Object_i_._this (); this->mT_Object_var_->yadda (0, - tmp.in () - ACE_ENV_ARG_PARAMETER); + tmp.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "MT_Server::run_ORB_briefly"); + ex._tao_print_exception ("MT_Server::run_ORB_briefly"); return -1; } - ACE_ENDTRY; } return 0; } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index ee7bb23692a..5d1e4de11a9 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -64,15 +64,13 @@ MT_Object_Server::parse_args (void) int MT_Object_Server::init (int argc, - char** argv - ACE_ENV_ARG_DECL) + char** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); this->argc_ = argc; this->argv_ = argv; @@ -82,8 +80,7 @@ MT_Object_Server::init (int argc, CORBA::String_var str; str = this->orb_manager_.activate_under_child_poa ("MT_Object", - &this->mT_Object_i_ - ACE_ENV_ARG_PARAMETER); + &this->mT_Object_i_); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -128,10 +125,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); + int r = MT_Object_Server.init (argc,argv); if (r == -1) return 1; @@ -140,16 +136,15 @@ main (int argc, char *argv[]) MT_Object_Server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index 289fb53c542..e4fc7ef94bf 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -48,8 +48,7 @@ public: // Destructor int init (int argc, - char **argv - ACE_ENV_ARG_DECL); + char **argv); // Initialize the NestedUpCalls_Server state - parsing arguments and ... int run (void); diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index d4cdb5d0274..63b9bdd4b8e 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -40,7 +40,7 @@ Client_Task::Client_Task (client_ptr c, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { if (!quiet) ACE_DEBUG ((LM_DEBUG, @@ -49,16 +49,13 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), - call_count - ACE_ENV_ARG_PARAMETER); + call_count); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client_Task::svc"); + ex._tao_print_exception ("Client_Task::svc"); return -1; } - ACE_ENDTRY; return 0; } @@ -115,35 +112,30 @@ int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); if (result != 0) return result; - CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); poa_manager->activate (); - object = orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior); - server_var server = server::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + server_var server = server::_narrow (object.in ()); // Create an client object to hand to the other side... client_i client_servant (quiet, @@ -162,15 +154,12 @@ main (int argc, } root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "client::main"); + ex._tao_print_exception ("client::main"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp index 3d4db29c601..e439f6a4461 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp @@ -10,8 +10,7 @@ client_i::client_i (int quiet, } void -client_i::ping (CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) +client_i::ping (CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -23,7 +22,6 @@ client_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { - this->server_->ping (time_to_live - ACE_ENV_ARG_PARAMETER); + this->server_->ping (time_to_live); } } diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h index c90a070e907..e58d414344e 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.h +++ b/TAO/tests/NestedUpcall/Simple/client_i.h @@ -9,8 +9,7 @@ public: server_ptr s); // Constructor. - void ping (CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) + void ping (CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 5c2e9e4db9d..24b97badb94 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -33,16 +33,14 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb) int Server_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } @@ -115,24 +113,21 @@ int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); if (result != 0) return result; - CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -144,8 +139,7 @@ main (int argc, server_var server_object = server_servant._this (); - CORBA::String_var ior = orb->object_to_string (server_object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var ior = orb->object_to_string (server_object.in ()); result = write_ior_to_file (ior.in ()); if (result != 0) @@ -165,16 +159,13 @@ main (int argc, return result; root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "server::main"); + ex._tao_print_exception ("server::main"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index e928eb9bc1d..1a93ac4f244 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -11,20 +11,17 @@ server_i::server_i (int quiet, void server_i::start (client_ptr c, - CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) + CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_ = client::_duplicate (c); - this->ping (time_to_live - ACE_ENV_ARG_PARAMETER); + this->ping (time_to_live); return; } void -server_i::ping (CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) +server_i::ping (CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -36,8 +33,7 @@ server_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { - this->client_->ping (time_to_live - ACE_ENV_ARG_PARAMETER); + this->client_->ping (time_to_live); } } @@ -45,6 +41,5 @@ void server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index 565517aa648..ce84f3493c8 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -8,13 +8,11 @@ public: server_i (int quiet, CORBA::ORB_ptr orb); - void ping (CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) + void ping (CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)); void start (client_ptr c, - CORBA::UShort time_to_live - ACE_ENV_ARG_DECL) + CORBA::UShort time_to_live) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index efb4fb57796..40ac866ae9a 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -43,7 +43,7 @@ Client_Task::Client_Task (client_ptr c, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { if (!quiet) ACE_DEBUG ((LM_DEBUG, @@ -52,18 +52,15 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), - call_count - ACE_ENV_ARG_PARAMETER); + call_count); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client_Task::svc"); + ex._tao_print_exception ("Client_Task::svc"); return -1; } - ACE_ENDTRY; return 0; } @@ -124,35 +121,30 @@ int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); if (result != 0) return result; - CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); poa_manager->activate (); - object = orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior); - server_var server = server::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + server_var server = server::_narrow (object.in ()); // Create an client object to hand to the other side... client_i client_servant (quiet, @@ -172,15 +164,12 @@ main (int argc, } root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "client::main"); + ex._tao_print_exception ("client::main"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index c23ffbbd598..27fac829ee9 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -42,18 +42,16 @@ Initiator_i::foo_object_B (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n")); - ACE_TRY + try { - this->object_B_var_->foo (this->object_A_var_.in () - ACE_ENV_ARG_PARAMETER); + this->object_B_var_->foo (this->object_A_var_.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the server"); + ex._tao_print_exception ("calling the server"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) END Initiator_i::foo_object_B ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index a354261d180..f36dd401fbf 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -37,22 +37,20 @@ Object_A_i::~Object_A_i (void) void -Object_A_i::foo (Initiator_ptr theInitiator_ptr - ACE_ENV_ARG_DECL) +Object_A_i::foo (Initiator_ptr theInitiator_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { theInitiator_ptr->foo_object_B (); while (!this->finish_two_way_call_) TAO_ORB_Core_instance ()->reactor ()->handle_events (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator"); + ex._tao_print_exception ("calling the initiator"); } - ACE_ENDTRY; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index fe7a73cc1ff..af7844e99a3 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -34,8 +34,7 @@ public: virtual ~Object_A_i (void); // Destructor. - virtual void foo (Initiator_ptr theInitiator_ptr - ACE_ENV_ARG_DECL) + virtual void foo (Initiator_ptr theInitiator_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void finish (void) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 5b21ce7dc82..1d66255420b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -36,11 +36,10 @@ Object_B_i::~Object_B_i (void) void -Object_B_i::foo (Object_A_ptr theObject_A_ptr - ACE_ENV_ARG_DECL) +Object_B_i::foo (Object_A_ptr theObject_A_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, @@ -56,10 +55,9 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr ACE_OS::sleep(pause); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator"); + ex._tao_print_exception ("calling the initiator"); } - ACE_ENDTRY; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index c76b4d2ab80..35c9f311e19 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -34,8 +34,7 @@ public: virtual ~Object_B_i (void); // Destructor. - virtual void foo(Object_A_ptr theObject_A_ptr - ACE_ENV_ARG_DECL) + virtual void foo(Object_A_ptr theObject_A_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 571f68354fd..412b73befa7 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -121,15 +121,13 @@ Initiator_Server::parse_args (void) int Initiator_Server::init (int argc, - char** argv - ACE_ENV_ARG_DECL) + char** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); this->argc_ = argc; this->argv_ = argv; @@ -143,16 +141,15 @@ Initiator_Server::init (int argc, this->argv_[0]), -1); - ACE_TRY + try { // Get Object A CORBA::Object_var object_A_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_A_key_ - ACE_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->string_to_object (this->object_A_key_); this->object_A_var_ = - Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER); + Object_A::_narrow (object_A_obj_var.in()); if (CORBA::is_nil (this->object_A_var_.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -171,11 +168,10 @@ Initiator_Server::init (int argc, // Get Object B CORBA::Object_var object_B_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_B_key_ - ACE_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->string_to_object (this->object_B_key_); this->object_B_var_ = - Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER); + Object_B::_narrow (object_B_obj_var.in()); if (CORBA::is_nil (this->object_B_var_.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -193,17 +189,16 @@ Initiator_Server::init (int argc, this->orb_manager_.activate_poa_manager (); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; ACE_NEW_RETURN (this->initiator_i_ptr_, Initiator_i(this->object_A_var_.in(), @@ -211,8 +206,7 @@ Initiator_Server::init (int argc, -1); this->str_ = - this->orb_manager_.activate (this->initiator_i_ptr_ - ACE_ENV_ARG_PARAMETER); + this->orb_manager_.activate (this->initiator_i_ptr_); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -227,7 +221,7 @@ Initiator_Server::init (int argc, int Initiator_Server::run (void) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "Initiator_Server::run: Trying to invoke " @@ -236,22 +230,21 @@ Initiator_Server::run (void) Initiator_var initiator = this->initiator_i_ptr_->_this(); - this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER); + this->object_A_var_->foo (initiator.in ()); ACE_DEBUG ((LM_DEBUG, "Initiator_Server::run: Returned from invoke " "foo on Object A\n")); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } @@ -263,17 +256,15 @@ Initiator_Server::~Initiator_Server (void) if (this->object_B_key_ != 0) ACE_OS::free (this->object_B_key_); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - this->orb_manager_.deactivate (this->str_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_manager_.deactivate (this->str_.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Initiator_Server::~Initiator_Server"); + ex._tao_print_exception ( + "Initiator_Server::~Initiator_Server"); } - ACE_ENDTRY; delete this->initiator_i_ptr_; } @@ -284,13 +275,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Initiator_Server initiator_Server; int retval = - initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + initiator_Server.init (argc, argv); if (retval == -1) return 1; @@ -299,16 +289,15 @@ main (int argc, char *argv[]) initiator_Server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 08b6e608d2c..17487f4027f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -51,8 +51,7 @@ public: // read in the IOR's for the two objects A and B int init (int argc, - char **argv - ACE_ENV_ARG_DECL); + char **argv); // Initialize the Initiator_Server state - parsing arguments and ... int run (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index ed9dc79250f..ae720385ef4 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -64,15 +64,13 @@ Object_A_Server::parse_args (void) int Object_A_Server::init (int argc, - char** argv - ACE_ENV_ARG_DECL) + char** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); this->argc_ = argc; this->argv_ = argv; @@ -82,8 +80,7 @@ Object_A_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_A", - &this->object_A_i_ - ACE_ENV_ARG_PARAMETER); + &this->object_A_i_); if (this->ior_output_file_) { @@ -122,11 +119,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int retval = - object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); + object_A_Server.init (argc,argv); if (retval == -1) return 1; @@ -135,16 +131,15 @@ main (int argc, char *argv[]) object_A_Server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index c2e7382586e..6df7d8d7bb2 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -48,8 +48,7 @@ public: // Destructor int init (int argc, - char **argv - ACE_ENV_ARG_DECL); + char **argv); // Initialize the NestedUpCalls_Server state - parsing arguments and ... int run (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 52468d0897e..0b11e3e61f4 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -64,15 +64,13 @@ Object_B_Server::parse_args (void) int Object_B_Server::init (int argc, - char** argv - ACE_ENV_ARG_DECL) + char** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); + "child_poa"); this->argc_ = argc; this->argv_ = argv; @@ -82,8 +80,7 @@ Object_B_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_B", - &this->object_B_i_ - ACE_ENV_ARG_PARAMETER); + &this->object_B_i_); if (this->ior_output_file_) { @@ -122,10 +119,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = object_B_Server.init (argc, argv); if (retval == -1) return 1; @@ -134,16 +130,15 @@ main (int argc, char *argv[]) object_B_Server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index eb2f1c2dbfe..e4634ff7547 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -48,8 +48,7 @@ public: // Destructor int init (int argc, - char **argv - ACE_ENV_ARG_DECL); + char **argv); // Initialize the NestedUpCalls_Server state - parsing arguments and ... int run (void); diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 064db07d85b..0490bb71ad3 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -70,16 +70,14 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -87,12 +85,10 @@ main (int argc, char **argv) return parse_args_result; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -100,18 +96,15 @@ main (int argc, char **argv) poa_manager->activate (); // Get an object reference from the argument string. - object = orb->string_to_object (IOR - ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (IOR); // Try to narrow the object reference to a <server> reference. - server_var server_object = server::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + server_var server_object = server::_narrow (object.in ()); client_i servant (server_object.in ()); servant.loop (event_loop_depth, - event_loop_iterations - ACE_ENV_ARG_PARAMETER); + event_loop_iterations); // Shutdown server. if (shutdown_server) @@ -120,16 +113,13 @@ main (int argc, char **argv) } root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 32f725a8fc4..04113692445 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -38,21 +38,18 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -66,8 +63,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server_object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server_object.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,16 +83,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index c05f95b0850..32603e98df8 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -13,8 +13,7 @@ server_i::server_i (CORBA::ORB_ptr orb) void server_i::loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations - ACE_ENV_ARG_DECL) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -23,25 +22,21 @@ server_i::loop (client_ptr remote_partner, event_loop_iterations)); this->run_no_ops (remote_partner, - event_loop_iterations / 2 - ACE_ENV_ARG_PARAMETER); + event_loop_iterations / 2); if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, - event_loop_iterations - ACE_ENV_ARG_PARAMETER); + event_loop_iterations); } this->run_no_ops (remote_partner, - event_loop_iterations / 2 - ACE_ENV_ARG_PARAMETER); + event_loop_iterations / 2); } void server_i::run_no_ops (client_ptr remote_partner, - CORBA::ULong iterations - ACE_ENV_ARG_DECL) + CORBA::ULong iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { while (iterations != 0) @@ -69,8 +64,7 @@ server_i::run_no_ops (client_ptr remote_partner, sizeof_pointer_to_flag); remote_partner->oneway_no_op (act_for_iterations, - act_for_flag - ACE_ENV_ARG_PARAMETER); + act_for_flag); while (!got_reply) { @@ -82,8 +76,7 @@ server_i::run_no_ops (client_ptr remote_partner, void server_i::no_op (client_ptr remote_partner, const act &act_for_iterations, - const act &act_for_flag - ACE_ENV_ARG_DECL) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong *pointer_to_iterations = 0; @@ -113,8 +106,7 @@ void server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } client_i::client_i (server_ptr remote_partner) @@ -124,8 +116,7 @@ client_i::client_i (server_ptr remote_partner) void client_i::loop (CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -133,50 +124,41 @@ client_i::loop (CORBA::ULong event_loop_depth, event_loop_depth, event_loop_iterations)); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { client_var self = this->_this (); this->remote_partner_->loop (self.in (), event_loop_depth, - event_loop_iterations - ACE_ENV_ARG_PARAMETER); + event_loop_iterations); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client_i::loop:"); + ex._tao_print_exception ("Exception caught in client_i::loop:"); } - ACE_ENDTRY; } void client_i::oneway_no_op (const act &act_for_iterations, - const act &act_for_flag - ACE_ENV_ARG_DECL_NOT_USED) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { client_var self = this->_this (); this->remote_partner_->no_op (self.in (), act_for_iterations, - act_for_flag - ACE_ENV_ARG_PARAMETER); + act_for_flag); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client_i::no_op:"); + ex._tao_print_exception ("Exception caught in client_i::no_op:"); } - ACE_ENDTRY; } void diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h index 4bde5b548d4..e7f8420ad0b 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.h +++ b/TAO/tests/Nested_Event_Loop/test_i.h @@ -9,19 +9,16 @@ public: void loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations - ACE_ENV_ARG_DECL) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)); void run_no_ops (client_ptr remote_partner, - CORBA::ULong iterations - ACE_ENV_ARG_DECL) + CORBA::ULong iterations) ACE_THROW_SPEC ((CORBA::SystemException)); void no_op (client_ptr remote_partner, const act &act_for_iterations, - const act &act_for_flag - ACE_ENV_ARG_DECL_NOT_USED) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -37,13 +34,11 @@ public: client_i (server_ptr remote_partner); void loop (CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong event_loop_iterations) ACE_THROW_SPEC ((CORBA::SystemException)); void oneway_no_op (const act &act_for_iterations, - const act &act_for_flag - ACE_ENV_ARG_DECL_NOT_USED) + const act &act_for_flag) ACE_THROW_SPEC ((CORBA::SystemException)); void twoway_no_op (void) diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index a0640709892..acb1210811c 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -30,8 +30,7 @@ Client_Peer::Client_Peer (CORBA::ORB_ptr orb) void Client_Peer::callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const & - ACE_ENV_ARG_DECL) + Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Received call, depth = %d\n", max_depth)); @@ -42,8 +41,7 @@ Client_Peer::callme(Test::Peer_ptr callback, Test::Payload return_data; - callback->callme(me.in(), max_depth - 1, return_data - ACE_ENV_ARG_PARAMETER); + callback->callme(me.in(), max_depth - 1, return_data); } } diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h index 9a22962deff..9f80723f8a1 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h @@ -19,8 +19,7 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const & - ACE_ENV_ARG_DECL) + Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)); void crash(void) ACE_THROW_SPEC((CORBA::SystemException)); diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index ada0fd93997..8e45bd30f9f 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -23,8 +23,7 @@ Server_Peer::Server_Peer (ACE_RANDR_TYPE seed, void Server_Peer::callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const & - ACE_ENV_ARG_DECL) + Test::Payload const &) ACE_THROW_SPEC((CORBA::SystemException)) { int r = ACE_OS::rand_r(this->seed_) % 50; @@ -38,16 +37,15 @@ Server_Peer::callme(Test::Peer_ptr callback, if(r == 0) { - ACE_TRY + try { callback->crash(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; - // orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + // orb_->shutdown (0); } else if (max_depth > 0) { @@ -58,8 +56,7 @@ Server_Peer::callme(Test::Peer_ptr callback, extra_data.length(this->payload_size_); callback->callme(me.in(), max_depth - 1, - extra_data - ACE_ENV_ARG_PARAMETER); + extra_data); } } @@ -67,7 +64,7 @@ void Server_Peer::crash(void) ACE_THROW_SPEC((CORBA::SystemException)) { - ACE_THROW(CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } void diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h index ddd641be141..a165d5372b5 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h @@ -21,8 +21,7 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const & extra_data - ACE_ENV_ARG_DECL) + Test::Payload const & extra_data) ACE_THROW_SPEC((CORBA::SystemException)); void crash(void) ACE_THROW_SPEC((CORBA::SystemException)); diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 69d8a2a99bb..5af5dd41596 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -32,19 +32,16 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,10 +52,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -71,11 +68,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -92,12 +87,10 @@ main (int argc, char *argv[]) impl->_this (); CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Peer_var peer = - Test::Peer::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Peer::_narrow(tmp.in ()); if (CORBA::is_nil (peer.in ())) { @@ -116,22 +109,19 @@ main (int argc, char *argv[]) reactor->schedule_timer(&timer, 0, interval, interval); ACE_Time_Value run_time(120, 0); - orb->run (run_time ACE_ENV_ARG_PARAMETER); + orb->run (run_time); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); - root_poa->destroy (1, 1 - ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index 260cbb99d1a..b029f32878e 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -26,19 +26,16 @@ main (int argc, char *argv[]) { int ret_val = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -51,11 +48,9 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -63,12 +58,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Peer_var peer = - Test::Peer::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Test::Peer::_narrow(tmp.in ()); if (CORBA::is_nil (peer.in ())) { @@ -89,13 +82,11 @@ main (int argc, char *argv[]) orb->destroy (); */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); ret_val = 1; } - ACE_ENDTRY; return ret_val; } diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index a4d01dea06d..df638162a03 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -35,19 +35,16 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,10 +55,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -74,12 +71,10 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policy_current->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); @@ -100,8 +95,7 @@ main (int argc, char *argv[]) impl->_this (); CORBA::String_var ior = - orb->object_to_string (peer.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (peer.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -122,23 +116,20 @@ main (int argc, char *argv[]) reactor->schedule_timer(&sleeper, 0, interval, interval); // ACE_Time_Value run_time(600, 0); - // orb->run (run_time ACE_ENV_ARG_PARAMETER); + // orb->run (run_time); orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 - ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index ccec464d929..fa26fcd71b9 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -74,19 +74,19 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -116,13 +116,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -139,7 +137,7 @@ Client::Client (Simple_Server_ptr server, int Client::svc (void) { - ACE_TRY_NEW_ENV + try { for (int i = 0; i < this->niterations_; ++i) { @@ -150,11 +148,10 @@ Client::svc (void) i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected exceptions \n")); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp index 39c7be71a69..099f923d977 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -64,7 +64,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,17 +87,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } 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 a6ab6e91767..1bc53fd3329 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -19,5 +19,5 @@ void Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index 0f84c1dfe81..e273412e2d5 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -12,8 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) CORBA::Any* Test_impl::get_something ( - CORBA::Boolean need_vb - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Boolean need_vb) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_ptr ret_val_ptr = 0; @@ -48,8 +47,7 @@ Test_impl::get_something ( } OBV_AnyTest::VB * -Test_impl::get_vb( - ACE_ENV_ARG_DECL_NOT_USED) +Test_impl::get_vb() ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULong magic = 3145; @@ -65,5 +63,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index 2c934a6cffb..610d83162a1 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -32,8 +32,7 @@ public: // ctor virtual CORBA::Any * get_something ( - CORBA::Boolean need_vb - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean need_vb) ACE_THROW_SPEC ((CORBA::SystemException)); virtual OBV_AnyTest::VB * get_vb (void) diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index 916e9d3038b..52cfb6f4f75 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n")); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -55,8 +55,7 @@ main (int argc, char *argv[]) 1); // supplied by mapping orb->register_value_factory (va_factory->tao_repository_id (), - va_factory - ACE_ENV_ARG_PARAMETER); + va_factory); va_factory->_remove_ref (); // release ownership @@ -66,8 +65,7 @@ main (int argc, char *argv[]) 1); // supplied by mapping orb->register_value_factory (vb_factory->tao_repository_id (), - vb_factory - ACE_ENV_ARG_PARAMETER); + vb_factory); vb_factory->_remove_ref (); // release ownership // Do local test @@ -131,10 +129,10 @@ main (int argc, char *argv[]) // Now do remote test CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); OBV_AnyTest::Test_var test = - OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + OBV_AnyTest::Test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -147,8 +145,7 @@ main (int argc, char *argv[]) // STEP 1. CORBA::Any_var result = test->get_something ( - 0 - ACE_ENV_ARG_PARAMETER); + 0); if (!(result.inout () >>= dst) || dst->id () != magic) { @@ -160,8 +157,7 @@ main (int argc, char *argv[]) // STEP 2. OBV_AnyTest::VB* dst_vb = 0; result = test->get_something ( - 1 - ACE_ENV_ARG_PARAMETER); + 1); if (!(result.inout () >>= dst_vb) || dst_vb->id () != magic) { @@ -190,8 +186,7 @@ main (int argc, char *argv[]) // STEP 4. get a VB, but extract to a VA*. result = test->get_something ( - 1 - ACE_ENV_ARG_PARAMETER); + 1); if (!(result.inout () >>= CORBA::Any::to_value(target.out()))) { @@ -214,13 +209,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index d5567d9696f..1fb435a3eb9 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,7 +70,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,17 +90,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server:"); + ex._tao_print_exception ("Exception caught in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp index cc27085a734..1c3a2d27b51 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp @@ -17,7 +17,7 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { // All factories are kindly provided by // compiler so we just to put everything in a right order. @@ -29,8 +29,7 @@ Client_Task::svc (void) 1); this->corb_->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -40,8 +39,7 @@ Client_Task::svc (void) 1); this->corb_->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -51,17 +49,16 @@ Client_Task::svc (void) 1); this->corb_->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); sn_factory->_remove_ref (); // release ownership //Well, done with factories. // Obtain reference to the object. CORBA::Object_var tmp = - this->corb_->string_to_object(this->input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object(this->input_); - Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test_var test = Test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -157,7 +154,7 @@ Client_Task::svc (void) } TreeController_var tc_result = - test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); + test->reflect (tc.in ()); // The following two ifs will fail until bug 1390 is fixed. if (is_equal_tree (tc.in (), tc_result.in ())) @@ -177,13 +174,11 @@ Client_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp index 4810498ea88..adc22cd2ac0 100644 --- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp @@ -47,15 +47,13 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -77,8 +75,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -93,10 +90,9 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index 29fc693923e..0487ad694e6 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -23,7 +23,7 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { // All factories are kindly provided by // compiler so we just to put everything in a right order. @@ -35,8 +35,7 @@ Server_Task::svc (void) 1); this->sorb_->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -46,8 +45,7 @@ Server_Task::svc (void) 1); this->sorb_->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -57,17 +55,16 @@ Server_Task::svc (void) 1); this->sorb_->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); 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); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,7 +84,7 @@ Server_Task::svc (void) Test_var test = test_impl->_this (); CORBA::String_var ior = - this->sorb_->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (test.in ()); // If the this->output_ exists, output the ior to it FILE *output_file= ACE_OS::fopen (this->output_, "w"); @@ -107,17 +104,15 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp index adda7e06dda..780ba158671 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp @@ -27,8 +27,7 @@ reflect_node (BaseNode* bn) } TreeController * -Test_impl::reflect (TreeController * tc - ACE_ENV_ARG_DECL_NOT_USED) +Test_impl::reflect (TreeController * tc) ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) @@ -43,5 +42,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h index 075ad0cb0ca..662273c97f9 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h @@ -34,8 +34,7 @@ public: // ctor virtual TreeController * reflect ( - TreeController * tc - ACE_ENV_ARG_DECL_NOT_USED) + TreeController * tc) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index bfc2842ae64..597f190ba66 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -51,5 +51,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp index efe47235d4f..5cd4fd15d9a 100644 --- a/TAO/tests/OBV/Factory/client.cpp +++ b/TAO/tests/OBV/Factory/client.cpp @@ -38,24 +38,23 @@ bool no_factory (OBV_FactoryTest::Test_ptr test) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // 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_CATCH (CORBA::MARSHAL, ex) + catch (const CORBA::MARSHAL& ex) { if ((ex.minor() & 0xFFFU) == 1) { succeed = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -69,20 +68,20 @@ no_factory (OBV_FactoryTest::Test_ptr test) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; // Obtain reference to the object CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); OBV_FactoryTest::Test_var test = - OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + OBV_FactoryTest::Test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -104,8 +103,7 @@ main (int argc, char *argv[]) 1); // supplied by mapping orb->register_value_factory (base_factory->tao_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); + base_factory); base_factory->_remove_ref (); // release ownership OBV_FactoryTest::Value1_init *value1_factory = 0; @@ -114,8 +112,7 @@ main (int argc, char *argv[]) 1); // supplied by mapping orb->register_value_factory (value1_factory->tao_repository_id (), - value1_factory - ACE_ENV_ARG_PARAMETER); + value1_factory); value1_factory->_remove_ref (); OBV_FactoryTest::Value2_init *value2_factory = 0; @@ -124,8 +121,7 @@ main (int argc, char *argv[]) 1); // custom implementation orb->register_value_factory (value2_factory->tao_repository_id (), - value2_factory - ACE_ENV_ARG_PARAMETER); + value2_factory); value2_factory->_remove_ref (); // Now perform the test. I don't check return values. @@ -154,13 +150,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 66fec931f07..231bc724184 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,7 +70,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -88,17 +88,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index ea3bc443b48..8282676a725 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -30,8 +30,7 @@ reflect_node (BaseNode* bn) } TreeController * -Test_impl::reflect (TreeController * tc - ACE_ENV_ARG_DECL_NOT_USED) +Test_impl::reflect (TreeController * tc) ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) @@ -46,5 +45,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index 7e2cc36574b..bd5a1eb6726 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -32,8 +32,7 @@ public: // ctor virtual TreeController * reflect ( - TreeController * tc - ACE_ENV_ARG_DECL_NOT_USED) + TreeController * tc) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index 77d6ba5a4cb..62fdb78b03a 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -82,10 +82,10 @@ dump_tree (TreeController *tc) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -100,8 +100,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -111,8 +110,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -122,17 +120,16 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); sn_factory->_remove_ref (); // release ownership //Well, done with factories. // Obtain reference to the object. CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); - Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test_var test = Test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -185,7 +182,7 @@ main (int argc, char *argv[]) dump_tree (tc.in ()); TreeController_var result_tc = - test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); + test->reflect (tc.in ()); // Dump the resulting tree. dump_tree (result_tc.in ()); @@ -197,13 +194,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index 2888506ce84..87c4e70ceb0 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -41,10 +41,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // All factories are kindly provided by // compiler so we just to put everything in a right order. @@ -56,8 +56,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -67,8 +66,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -78,17 +76,16 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); + sn_factory); sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -111,7 +108,7 @@ main (int argc, char *argv[]) Test_var test = test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -129,17 +126,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp index 955841cb593..bb150ce6abd 100644 --- a/TAO/tests/OBV/Simple/Client_i.cpp +++ b/TAO/tests/OBV/Simple/Client_i.cpp @@ -21,32 +21,30 @@ Checkpoint_Client_i::run (const char *name, ACE_Time_Value now (ACE_OS::gettimeofday ()); ACE_OS::srand ((unsigned int) now.sec () ); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "Send some random events:\n")); CORBA::Long value = 64; Event_var t_e (static_cast<Event*> (new Event_impl (value))); t_e->do_print (); - checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e); value = 34; t_e = new Event_impl (value); t_e->do_print (); - checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e); if (checkpoint.shutdown () == 1) checkpoint->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI"); + ex._tao_print_exception ("\n Exception in RMI"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp index 6f7bbb07512..4313a82209a 100644 --- a/TAO/tests/OBV/Simple/Server_i.cpp +++ b/TAO/tests/OBV/Simple/Server_i.cpp @@ -42,8 +42,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o) void -Checkpoint_i::put_event (Event *event - ACE_ENV_ARG_DECL_NOT_USED) +Checkpoint_i::put_event (Event *event) ACE_THROW_SPEC ((CORBA::SystemException)) { // Let us see what event has arrived diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h index c1a026c25e2..8eec39d2bef 100644 --- a/TAO/tests/OBV/Simple/Server_i.h +++ b/TAO/tests/OBV/Simple/Server_i.h @@ -37,12 +37,10 @@ public: virtual void put_event ( Event * e - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index e20e22eb249..b4048168fa0 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -69,15 +69,13 @@ Server<Servant>::parse_args (void) template <class Servant> int Server<Servant>::init (const char *servant_name, int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER) == -1) + "child_poa") == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -101,12 +99,11 @@ Server<Servant>::init (const char *servant_name, // Make sure that you check for failures here via the ACE_TRY // macros?! - ACE_TRY + try { CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, - &this->servant_ - ACE_ENV_ARG_PARAMETER); + &this->servant_); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", @@ -121,13 +118,11 @@ Server<Servant>::init (const char *servant_name, } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in activation of POA"); + ex._tao_print_exception ("Exception in activation of POA"); return -1; } - ACE_ENDTRY; return 0; } @@ -239,15 +234,13 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - name - ACE_ENV_ARG_PARAMETER); + name); // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -258,7 +251,7 @@ Client<InterfaceObj, Var>::init (const char *name, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_); if (CORBA::is_nil (server_object.in ())) @@ -266,8 +259,7 @@ Client<InterfaceObj, Var>::init (const char *name, "invalid ior <%s>\n", this->ior_), -1); - this->server_ = InterfaceObj::_narrow (server_object.in () - ACE_ENV_ARG_PARAMETER); + this->server_ = InterfaceObj::_narrow (server_object.in ()); } else ACE_ERROR_RETURN ((LM_ERROR, @@ -276,12 +268,11 @@ Client<InterfaceObj, Var>::init (const char *name, } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init"); + ex._tao_print_exception ("Client_i::init"); return -1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index ef7230a7996..abe49613309 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -51,8 +51,7 @@ public: int init (const char *servant_name, int argc, - char *argv[] - ACE_ENV_ARG_DECL); + char *argv[]); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp index 5f6a2bb5a07..31b84c2b421 100644 --- a/TAO/tests/OBV/Simple/server.cpp +++ b/TAO/tests/OBV/Simple/server.cpp @@ -12,31 +12,28 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tCheckpoint Event_Types server\n\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (server.init ("Event_Types_Checkpoint", argc, - argv - ACE_ENV_ARG_PARAMETER) == -1) + argv) == -1) return 1; else { server.run (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index 25d27ca312e..a0f58373504 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -13,14 +13,14 @@ vt_graph_impl::vt_graph_impl (void) // Creates a vt_graph_impl with the given number of nodes. There will be one // root node and the rest will be children of it. -vt_graph_impl::vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL) +vt_graph_impl::vt_graph_impl (int num_nodes) { nodes_ ().length (0); - add_node ("ROOT" ACE_ENV_ARG_PARAMETER); + add_node ("ROOT"); for (int i = 1; i < num_nodes; i++) { - add_node ("CHILD" ACE_ENV_ARG_PARAMETER); - nodes_ ()[0]->add_edge (nodes_ ()[i] ACE_ENV_ARG_PARAMETER); + add_node ("CHILD"); + nodes_ ()[0]->add_edge (nodes_ ()[i]); } } @@ -33,7 +33,7 @@ CORBA::Long vt_graph_impl::size (void) // Add a node to the graph with no edges. void -vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL_NOT_USED) +vt_graph_impl::add_node (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { Supports_Test::Node * new_node = 0; @@ -91,85 +91,79 @@ test_impl::~test_impl (void) void test_impl::pass_obj_graph_in ( - Supports_Test::graph * graph_param - ACE_ENV_ARG_DECL) + Supports_Test::graph * graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { ACE_ASSERT (graph_param->size () == 3); - graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); + graph_param->add_node ("NEW1"); ACE_ASSERT (graph_param->size () == 4); } void test_impl::pass_vt_graph_in ( - Supports_Test::vt_graph * vt_graph_param - ACE_ENV_ARG_DECL) + Supports_Test::vt_graph * vt_graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { ACE_ASSERT (vt_graph_param->size () == 3); - vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); + vt_graph_param->add_node ("NEW1"); ACE_ASSERT (vt_graph_param->size () == 4); } void test_impl::pass_obj_graph_out ( - Supports_Test::graph_out graph_param - ACE_ENV_ARG_DECL) + Supports_Test::graph_out graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { vt_graph_impl * the_vt_graph = 0; - ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER)); + ACE_NEW (the_vt_graph, vt_graph_impl (4)); graph_param = the_vt_graph->_this (); ACE_ASSERT (graph_param->size () == 4); - graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); + graph_param->add_node ("NEW1"); ACE_ASSERT (graph_param->size () == 5); } void test_impl::pass_vt_graph_out ( - Supports_Test::vt_graph_out vt_graph_param - ACE_ENV_ARG_DECL) + Supports_Test::vt_graph_out vt_graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { vt_graph_impl * the_vt_graph = 0; - ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER)); + ACE_NEW (the_vt_graph, vt_graph_impl (4)); vt_graph_param = the_vt_graph; ACE_ASSERT (vt_graph_param->size () == 4); - vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER); + vt_graph_param->add_node ("NEW1"); ACE_ASSERT (vt_graph_param->size () == 5); } void test_impl::pass_obj_graph_inout ( - Supports_Test::graph * &graph_param - ACE_ENV_ARG_DECL) + Supports_Test::graph * &graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { ACE_ASSERT (graph_param->size () == 6); - graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); + graph_param->add_node ("NEW3"); ACE_ASSERT (graph_param->size () == 7); } void test_impl::pass_vt_graph_inout ( - Supports_Test::vt_graph * &vt_graph_param - ACE_ENV_ARG_DECL) + Supports_Test::vt_graph * &vt_graph_param) ACE_THROW_SPEC (( CORBA::SystemException)) { ACE_ASSERT (vt_graph_param->size () == 6); - vt_graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); + vt_graph_param->add_node ("NEW3"); ACE_ASSERT (vt_graph_param->size () == 7); } @@ -204,7 +198,7 @@ node_impl::node_impl (const char * name) // Add an edge from this node to neighbor. void -node_impl::add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED) +node_impl::add_edge (Supports_Test::Node * neighbor) ACE_THROW_SPEC ((CORBA::SystemException)) { degree_ (degree_ () + 1); @@ -216,7 +210,7 @@ node_impl::add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED) // Remove the edge from this node to neighbor. void -node_impl::remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED) +node_impl::remove_edge (Supports_Test::Node * neighbor) ACE_THROW_SPEC ((CORBA::SystemException)) { for (unsigned int i = 0; i < neighbors_ ().length (); i++) @@ -229,7 +223,7 @@ node_impl::remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED } void -node_impl::change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL_NOT_USED) +node_impl::change_weight (CORBA::Long new_weight) ACE_THROW_SPEC ((CORBA::SystemException)) { weight_ (new_weight); diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 0faf0621804..d3b0be1649b 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -22,13 +22,13 @@ public: node_impl (const char * name); - virtual void add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL) + virtual void add_edge (Supports_Test::Node * neighbor) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL) + virtual void remove_edge (Supports_Test::Node * neighbor) ACE_THROW_SPEC ((CORBA::SystemException)); - void change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL) + void change_weight (CORBA::Long new_weight) ACE_THROW_SPEC ((CORBA::SystemException)); void print (void) @@ -59,14 +59,12 @@ class vt_graph_impl : vt_graph_impl (void); - vt_graph_impl (int num_nodes - ACE_ENV_ARG_DECL); + vt_graph_impl (int num_nodes); virtual CORBA::Long size (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void add_node (const char * name - ACE_ENV_ARG_DECL) + virtual void add_node (const char * name) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void print (void) @@ -97,28 +95,22 @@ class test_impl : virtual ~test_impl (void); - virtual void pass_obj_graph_in (Supports_Test::graph * graph_param - ACE_ENV_ARG_DECL) + virtual void pass_obj_graph_in (Supports_Test::graph * graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param - ACE_ENV_ARG_DECL) + virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param - ACE_ENV_ARG_DECL) + virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param - ACE_ENV_ARG_DECL) + virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param - ACE_ENV_ARG_DECL) + virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param - ACE_ENV_ARG_DECL) + virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void start (void) diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp index 328c4ca9e83..3f970fba886 100644 --- a/TAO/tests/OBV/Supports/client.cpp +++ b/TAO/tests/OBV/Supports/client.cpp @@ -40,18 +40,18 @@ int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1); @@ -69,8 +69,7 @@ main (int argc, char *argv[]) CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), - node_factory - ACE_ENV_ARG_PARAMETER); + node_factory); ACE_ASSERT (returned_factory == 0); @@ -83,8 +82,7 @@ main (int argc, char *argv[]) returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), - vt_graph_factory - ACE_ENV_ARG_PARAMETER); + vt_graph_factory); ACE_ASSERT (returned_factory == 0); @@ -99,8 +97,7 @@ main (int argc, char *argv[]) returned_factory = orb->register_value_factory (node_factory2->tao_repository_id (), - node_factory2 - ACE_ENV_ARG_PARAMETER); + node_factory2); ACE_ASSERT (returned_factory == node_factory); @@ -109,10 +106,10 @@ main (int argc, char *argv[]) /* Get test object reference */ - CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + CORBA::Object_var tmp = orb->string_to_object (ior); Supports_Test::test_var my_test = - Supports_Test::test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); + Supports_Test::test::_narrow (tmp.in ()); if (CORBA::is_nil (my_test.in ())) ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::test obj ref <%s>\n", ior), 1); @@ -129,7 +126,7 @@ main (int argc, char *argv[]) // object reference, stored as a graph_var. Increment the reference count // of the vt_graph_impl instance. vt_graph_impl * the_vt_graph = 0; - ACE_NEW_RETURN (the_vt_graph, vt_graph_impl (3 ACE_ENV_ARG_PARAMETER), 1); + ACE_NEW_RETURN (the_vt_graph, vt_graph_impl (3), 1); Supports_Test::vt_graph_var test_vt_graph = the_vt_graph; Supports_Test::graph_var test_graph = @@ -140,41 +137,41 @@ main (int argc, char *argv[]) // At this point, test_vt_graph and test_graph refer to the same object. ACE_ASSERT (test_vt_graph->size () == 3); - my_test->pass_vt_graph_in (test_vt_graph.in () ACE_ENV_ARG_PARAMETER); + my_test->pass_vt_graph_in (test_vt_graph.in ()); ACE_ASSERT (test_vt_graph->size () == 3); ACE_ASSERT (test_graph->size () == 3); - my_test->pass_obj_graph_in (test_graph.in () ACE_ENV_ARG_PARAMETER); + my_test->pass_obj_graph_in (test_graph.in ()); ACE_ASSERT (test_graph->size () == 4); - test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER); + test_vt_graph->add_node ("NEW2"); - test_graph->add_node ("NEW3" ACE_ENV_ARG_PARAMETER); + test_graph->add_node ("NEW3"); // After the 'pass_vt_graph_out' call returns, test_vt_graph will refer to // a new object. ACE_ASSERT (test_vt_graph->size () == 6); - my_test->pass_vt_graph_out (test_vt_graph.out () ACE_ENV_ARG_PARAMETER); + my_test->pass_vt_graph_out (test_vt_graph.out ()); 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 () == 6); - my_test->pass_obj_graph_out (test_graph.out () ACE_ENV_ARG_PARAMETER); + my_test->pass_obj_graph_out (test_graph.out ()); 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); + test_vt_graph->add_node ("NEW2"); - test_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER); + test_graph->add_node ("NEW2"); ACE_ASSERT (test_vt_graph->size () == 6); - my_test->pass_vt_graph_inout (test_vt_graph.inout () ACE_ENV_ARG_PARAMETER); + my_test->pass_vt_graph_inout (test_vt_graph.inout ()); ACE_ASSERT (test_vt_graph->size () == 7); ACE_ASSERT (test_graph->size () == 6); - my_test->pass_obj_graph_inout (test_graph.inout () ACE_ENV_ARG_PARAMETER); + my_test->pass_obj_graph_inout (test_graph.inout ()); ACE_ASSERT (test_graph->size () == 7); } @@ -188,13 +185,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp index 6f9ae5f9309..c2e58aade67 100644 --- a/TAO/tests/OBV/Supports/server.cpp +++ b/TAO/tests/OBV/Supports/server.cpp @@ -8,14 +8,14 @@ const char * ior_output_file = "test.ior"; int main (int argc, char * argv[]) { - ACE_TRY_NEW_ENV + try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA"); - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1); @@ -28,7 +28,7 @@ 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); + CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory); ACE_ASSERT (returned_factory == 0); @@ -38,7 +38,7 @@ 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); + returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory); ACE_ASSERT (returned_factory == 0); @@ -52,7 +52,7 @@ main (int argc, char * argv[]) Supports_Test::test_ptr a_test = a_test_impl->_this (); - CORBA::String_var ior = orb->object_to_string (a_test ACE_ENV_ARG_PARAMETER); + CORBA::String_var ior = orb->object_to_string (a_test); FILE * output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -68,19 +68,17 @@ main (int argc, char * argv[]) orb->run (); - root_poa->destroy (0, 0 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (0, 0); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Server (%P.%t) completed test successfully\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 98ded1b3373..1fc12bd96bb 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -18,8 +18,7 @@ int debug = 0; int do_shutdown = 0; int -register_factories (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) +register_factories (CORBA::ORB_ptr orb) { // Create and register factories. @@ -29,8 +28,7 @@ register_factories (CORBA::ORB_ptr orb -1); orb->register_value_factory (factory1->tao_repository_id (), - factory1 - ACE_ENV_ARG_PARAMETER); + factory1); factory1->_remove_ref (); @@ -40,8 +38,7 @@ register_factories (CORBA::ORB_ptr orb -1); orb->register_value_factory (factory3->tao_repository_id (), - factory3 - ACE_ENV_ARG_PARAMETER); + factory3); factory3->_remove_ref (); @@ -51,8 +48,7 @@ register_factories (CORBA::ORB_ptr orb -1); orb->register_value_factory (factory5->tao_repository_id (), - factory5 - ACE_ENV_ARG_PARAMETER); + factory5); factory5->_remove_ref (); @@ -62,8 +58,7 @@ register_factories (CORBA::ORB_ptr orb -1); orb->register_value_factory (factory7->tao_repository_id (), - factory7 - ACE_ENV_ARG_PARAMETER); + factory7); factory7->_remove_ref (); return 0; @@ -71,11 +66,9 @@ register_factories (CORBA::ORB_ptr orb int run_test (test_ptr objref, - CORBA::Long offset - ACE_ENV_ARG_DECL) + CORBA::Long offset) { - CORBA::Any_var result = objref->get_value (offset - ACE_ENV_ARG_PARAMETER); + CORBA::Any_var result = objref->get_value (offset); CORBA::Boolean status = 0; CORBA::Long member_value = 0; @@ -157,12 +150,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -170,11 +162,9 @@ main (int argc, char* argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior_input_file - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior_input_file); - int status = register_factories (orb.in () - ACE_ENV_ARG_PARAMETER); + int status = register_factories (orb.in ()); if (status != 0) { @@ -187,12 +177,11 @@ main (int argc, char* argv[]) return -1; } - test_var objref = test::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + test_var objref = test::_narrow (obj.in ()); for (CORBA::Long i = 1; i < 8; i += 2) { - status = run_test (objref.in (), i ACE_ENV_ARG_PARAMETER); + status = run_test (objref.in (), i); if (status == 0) { @@ -214,13 +203,11 @@ main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "exception:"); + ex._tao_print_exception ("exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index 5277ae3e7b3..8d7bc50a35d 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -12,17 +12,15 @@ const char *ior_output_file = "test.ior"; int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -32,8 +30,7 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -44,8 +41,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", @@ -74,15 +70,13 @@ main (int argc, char *argv[]) orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception caught - "); + ex._tao_print_exception ("Server: exception caught - "); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp index bf1a943de14..c43b35e717f 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.cpp +++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp @@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } CORBA::Any * -test_i::get_value (CORBA::Long offset - ACE_ENV_ARG_DECL) +test_i::get_value (CORBA::Long offset) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_ptr retval_ptr = 0; diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h index 12be77d3ce4..d8cbb71f070 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.h +++ b/TAO/tests/OBV/TC_Alignment/test_i.h @@ -39,8 +39,7 @@ class test_i :public virtual POA_test public: test_i (CORBA::ORB_ptr orb); - virtual CORBA::Any *get_value (CORBA::Long offset - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Any *get_value (CORBA::Long offset) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp index 894f7ef7be1..0c39a541611 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -16,7 +16,6 @@ Test_impl::op1 ( ::OBV_TruncatableTest::BaseValue * iv, ::OBV_TruncatableTest::BaseValue_out ov, char *& desc - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -45,7 +44,6 @@ Test_impl::op2 ( const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -74,7 +72,6 @@ Test_impl::op3 ( ::OBV_TruncatableTest::TValue4 * iv, ::OBV_TruncatableTest::TValue4_out ov, char *& desc - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -112,7 +109,6 @@ Test_impl::op4 ( ::OBV_TruncatableTest::TValue4 * iv3, ::OBV_TruncatableTest::TValue1 * iv4, char *& desc - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -163,7 +159,7 @@ Test_impl::op5 (const CORBA::Any& val, const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ACE_ENV_ARG_DECL ) + ) ACE_THROW_SPEC (( ::CORBA::SystemException )) @@ -201,5 +197,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h index 1b7a904d8c2..14e2c7bfeee 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h @@ -36,7 +36,6 @@ public: ::OBV_TruncatableTest::BaseValue * iv, ::OBV_TruncatableTest::BaseValue_out ov, char *& desc - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -47,7 +46,6 @@ public: const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -58,7 +56,6 @@ public: ::OBV_TruncatableTest::TValue4 * iv, ::OBV_TruncatableTest::TValue4_out ov, char *& desc - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -72,7 +69,6 @@ public: ::OBV_TruncatableTest::TValue4 * iv3, ::OBV_TruncatableTest::TValue1 * iv4, char *& desc - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( ::CORBA::SystemException @@ -82,7 +78,7 @@ public: const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ACE_ENV_ARG_DECL ) + ) ACE_THROW_SPEC (( ::CORBA::SystemException )); diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp index 7c8b962b95c..e000aaf57d2 100644 --- a/TAO/tests/OBV/Truncatable/client.cpp +++ b/TAO/tests/OBV/Truncatable/client.cpp @@ -57,10 +57,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -73,8 +73,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (base_factory->tao_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); + base_factory); base_factory->_remove_ref (); // release ownership @@ -85,8 +84,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value1_factory->tao_repository_id (), - value1_factory - ACE_ENV_ARG_PARAMETER); + value1_factory); value1_factory->_remove_ref (); @@ -97,8 +95,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value2_factory->tao_repository_id (), - value2_factory - ACE_ENV_ARG_PARAMETER); + value2_factory); value2_factory->_remove_ref (); @@ -108,8 +105,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value3_factory->tao_repository_id (), - value3_factory - ACE_ENV_ARG_PARAMETER); + value3_factory); value3_factory->_remove_ref (); OBV_TruncatableTest::TValue4_init *value4_factory = 0; @@ -118,8 +114,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value4_factory->tao_repository_id (), - value4_factory - ACE_ENV_ARG_PARAMETER); + value4_factory); value4_factory->_remove_ref (); OBV_TruncatableTest::TValue5_init *value5_factory = 0; @@ -128,8 +123,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value5_factory->tao_repository_id (), - value5_factory - ACE_ENV_ARG_PARAMETER); + value5_factory); value5_factory->_remove_ref (); OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0; @@ -138,16 +132,15 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (nested_value_factory->tao_repository_id (), - nested_value_factory - ACE_ENV_ARG_PARAMETER); + nested_value_factory); nested_value_factory->_remove_ref (); // Obtain reference to the object CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); OBV_TruncatableTest::Test_var test = - OBV_TruncatableTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + OBV_TruncatableTest::Test::_narrow(tmp.in ()); if (CORBA::is_nil (test.in ())) { @@ -171,8 +164,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op1 ("case1", &v1, ov1.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op1 ("case1", &v1, ov1.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), @@ -198,8 +190,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op1 ("case2", &v2, ov2.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op1 ("case2", &v2, ov2.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case2: A<-tB<-tC, truncate C to A")); @@ -216,8 +207,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op2 (&v2, "case3", otv1.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op2 (&v2, "case3", otv1.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case3: A<-tB<-tC, truncate C to B")); @@ -241,8 +231,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case3b: A<-tB, truncatable but no truncation")); @@ -261,7 +250,7 @@ main (int argc, char *argv[]) v3.data3 (99 * 3); bool caught_expected_exception = false; - ACE_TRY_EX (value3) + try { OBV_TruncatableTest::BaseValue_var ov3; desc = CORBA::string_dup @@ -269,17 +258,14 @@ main (int argc, char *argv[]) if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 4: %s: "), ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); - test->op1 ("case4", &v3, ov3.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (value3); + test->op1 ("case4", &v3, ov3.out (), desc.inout ()); } - ACE_CATCH (CORBA::MARSHAL, v3ex) + catch (const CORBA::MARSHAL& v3ex) { if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n"))); caught_expected_exception = true; } - ACE_ENDTRY; if ( ! caught_expected_exception) { @@ -310,8 +296,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 5: %s: "), ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op1 ("case5", &v5, ov5.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op1 ("case5", &v5, ov5.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case5: A<-tB<-tC, B & C have nested value type, truncate C to A")); @@ -328,8 +313,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 6: %s: "), ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op3 ("case6", &v5, otv4.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op3 ("case6", &v5, otv4.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case6: A<-tB<-tC, B & C have nested value type, truncate C to B")); @@ -352,8 +336,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 7: %s: "), ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op1 ("case7", &iv, ov.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op1 ("case7", &iv, ov.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case7: A<-tB, B has no data, truncate B to A")); @@ -395,8 +378,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; OBV_TruncatableTest::BaseValue_var ov - = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout () - ACE_ENV_ARG_PARAMETER); + = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), "case8: multiple IN truncatable valuetype parameters" @@ -424,8 +406,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op2 (&v1, "case9", ov1.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op2 (&v1, "case9", ov1.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), @@ -453,8 +434,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op5 (a, "case10", ov1.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op5 (a, "case10", ov1.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), @@ -482,8 +462,7 @@ main (int argc, char *argv[]) ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); pretest = fail; - test->op5 (a, "case11", ov1.out (), desc.inout () - ACE_ENV_ARG_PARAMETER); + test->op5 (a, "case11", ov1.out (), desc.inout ()); VERIFY (! ACE_OS::strcmp (desc.in (), @@ -511,13 +490,11 @@ main (int argc, char *argv[]) else ACE_DEBUG((LM_DEBUG, "(%P|%t) client: test passed \n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp index a7fd537d02c..9109575558e 100644 --- a/TAO/tests/OBV/Truncatable/server.cpp +++ b/TAO/tests/OBV/Truncatable/server.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -91,8 +91,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (base_factory->tao_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); + base_factory); base_factory->_remove_ref (); // release ownership OBV_TruncatableTest::TValue1_init *value1_factory = 0; @@ -101,8 +100,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value1_factory->tao_repository_id (), - value1_factory - ACE_ENV_ARG_PARAMETER); + value1_factory); value1_factory->_remove_ref (); OBV_TruncatableTest::TValue4_init *value4_factory = 0; @@ -111,8 +109,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (value4_factory->tao_repository_id (), - value4_factory - ACE_ENV_ARG_PARAMETER); + value4_factory); value4_factory->_remove_ref (); OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0; @@ -121,25 +118,22 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (nested_value_factory->tao_repository_id (), - nested_value_factory - ACE_ENV_ARG_PARAMETER); + nested_value_factory); nested_value_factory->_remove_ref (); orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index f08ffd276c3..ca91b357be5 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -31,8 +31,7 @@ void rotate_string(char *s) VBlong * -Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) +Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, @@ -52,8 +51,7 @@ Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3 vb_basic::M_VBlong * Test_impl::basic_op2 (vb_basic::M_VBlong * p1, vb_basic::M_VBlong *& p2, - vb_basic::M_VBlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + vb_basic::M_VBlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, @@ -72,8 +70,7 @@ Test_impl::basic_op2 (vb_basic::M_VBlong * p1, ::CORBA::Long Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2, - ::CORBA::Long_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::CORBA::Long_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p2 * 5; @@ -87,8 +84,7 @@ Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2, VBstring * Test_impl::string_op1 (::VBstring * p1, ::VBstring *& p2, - ::VBstring_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBstring_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { rotate_string (p2->_boxed_inout ()); @@ -110,8 +106,7 @@ Test_impl::string_op1 (::VBstring * p1, char * Test_impl::string_op2 (const char * p1, char *& p2, - CORBA::String_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::String_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { rotate_string (p2); @@ -131,8 +126,7 @@ Test_impl::string_op2 (const char * p1, ::VBseqlong * Test_impl::seq_op1 (::VBseqlong * p1, ::VBseqlong *& p2, - ::VBseqlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBseqlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, @@ -160,8 +154,7 @@ Test_impl::seq_op1 (::VBseqlong * p1, void Test_impl::seq_op2 (const ::TDseqlong & p1, ::TDseqlong & p2, - ::TDseqlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::TDseqlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (p3, @@ -181,8 +174,7 @@ Test_impl::seq_op2 (const ::TDseqlong & p1, ::VBfixed_struct1 * Test_impl::struct_op1 (::VBfixed_struct1 * p1, ::VBfixed_struct1 *& p2, - ::VBfixed_struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBfixed_struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, @@ -209,8 +201,7 @@ Test_impl::struct_op1 (::VBfixed_struct1 * p1, void Test_impl::struct_op2 (const ::Fixed_Struct1 & p1, ::Fixed_Struct1 & p2, - ::Fixed_Struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Fixed_Struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p1; @@ -223,8 +214,7 @@ Test_impl::struct_op2 (const ::Fixed_Struct1 & p1, ::VBvariable_struct1 * Test_impl::struct_op3 (::VBvariable_struct1 * p1, ::VBvariable_struct1 *& p2, - ::VBvariable_struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBvariable_struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { // transform p2 values @@ -247,8 +237,7 @@ Test_impl::struct_op3 (::VBvariable_struct1 * p1, void Test_impl::struct_op4 (const ::Variable_Struct1 & p1, ::Variable_Struct1 & p2, - ::Variable_Struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Variable_Struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (p3, @@ -264,8 +253,7 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1, ::VBlongarray * Test_impl::array_op1 (::VBlongarray * p1, ::VBlongarray *& p2, - ::VBlongarray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBlongarray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof(LongArray) / sizeof(CORBA::Long); @@ -290,8 +278,7 @@ Test_impl::array_op1 (::VBlongarray * p1, void Test_impl::array_op2 (const ::LongArray p1, ::LongArray p2, - ::LongArray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::LongArray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof(LongArray) / sizeof(CORBA::Long); @@ -312,8 +299,7 @@ Test_impl::array_op2 (const ::LongArray p1, ::VBstringarray * Test_impl::array_op3 (::VBstringarray * p1, ::VBstringarray *& p2, - ::VBstringarray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBstringarray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof( ::StringArray ) / sizeof( StringArray_slice ); @@ -340,8 +326,7 @@ Test_impl::array_op3 (::VBstringarray * p1, void Test_impl::array_op4 (const ::StringArray p1, ::StringArray p2, - ::StringArray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::StringArray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof( ::StringArray ) / sizeof( StringArray_slice ); @@ -369,8 +354,7 @@ Test_impl::array_op4 (const ::StringArray p1, ::VBfixed_union1 * Test_impl::union_op1 (::VBfixed_union1 * p1, ::VBfixed_union1 *& p2, - ::VBfixed_union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBfixed_union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long longValue; @@ -415,8 +399,7 @@ Test_impl::union_op1 (::VBfixed_union1 * p1, void Test_impl::union_op2 (const ::Fixed_Union1 & p1, ::Fixed_Union1 & p2, - ::Fixed_Union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Fixed_Union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p1; @@ -436,8 +419,7 @@ Test_impl::union_op2 (const ::Fixed_Union1 & p1, ::VBvariable_union1 * Test_impl::union_op3 (::VBvariable_union1 * p1, ::VBvariable_union1 *& p2, - ::VBvariable_union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBvariable_union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long longValue; @@ -485,8 +467,7 @@ Test_impl::union_op3 (::VBvariable_union1 * p1, void Test_impl::union_op4 (const ::Variable_Union1 & p1, ::Variable_Union1 & p2, - ::Variable_Union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Variable_Union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var stringValue; @@ -524,5 +505,5 @@ void Test_impl::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index d6c9ac780c7..ec82e9947b7 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -29,120 +29,101 @@ public: virtual VBlong * basic_op1 ( VBlong * p1, VBlong *& p2, - VBlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + VBlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual vb_basic::M_VBlong * basic_op2(vb_basic::M_VBlong * p1, vb_basic::M_VBlong *& p2, - vb_basic::M_VBlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + vb_basic::M_VBlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CORBA::Long basic_op3 ( ::CORBA::Long p1, ::CORBA::Long& p2, - ::CORBA::Long_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::CORBA::Long_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual VBstring * string_op1 (::VBstring * p1, ::VBstring *& p2, - ::VBstring_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBstring_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * string_op2 (const char * p1, char *& p2, - CORBA::String_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::String_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBseqlong * seq_op1 (::VBseqlong * p1, ::VBseqlong *& p2, - ::VBseqlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBseqlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void seq_op2 (const ::TDseqlong & p1, ::TDseqlong & p2, - ::TDseqlong_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::TDseqlong_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBfixed_struct1 * struct_op1 ( ::VBfixed_struct1 * p1, ::VBfixed_struct1 *& p2, - ::VBfixed_struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBfixed_struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void struct_op2 (const ::Fixed_Struct1 & p1, ::Fixed_Struct1 & p2, - ::Fixed_Struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Fixed_Struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBvariable_struct1 * struct_op3 (::VBvariable_struct1 * p1, ::VBvariable_struct1 *& p2, - ::VBvariable_struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBvariable_struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void struct_op4 (const ::Variable_Struct1 & p1, ::Variable_Struct1 & p2, - ::Variable_Struct1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Variable_Struct1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBlongarray * array_op1 (::VBlongarray * p1, ::VBlongarray *& p2, - ::VBlongarray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBlongarray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void array_op2 (const ::LongArray p1, ::LongArray p2, - ::LongArray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::LongArray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBstringarray * array_op3 (::VBstringarray * p1, ::VBstringarray *& p2, - ::VBstringarray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBstringarray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void array_op4 (const ::StringArray p1, ::StringArray p2, - ::StringArray_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::StringArray_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBfixed_union1 * union_op1 (::VBfixed_union1 * p1, ::VBfixed_union1 *& p2, - ::VBfixed_union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBfixed_union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void union_op2 (const ::Fixed_Union1 & p1, ::Fixed_Union1 & p2, - ::Fixed_Union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Fixed_Union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::VBvariable_union1 * union_op3 (::VBvariable_union1 * p1, ::VBvariable_union1 *& p2, - ::VBvariable_union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::VBvariable_union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void union_op4 (const ::Variable_Union1 & p1, ::Variable_Union1 & p2, - ::Variable_Union1_out p3 - ACE_ENV_ARG_DECL_NOT_USED) + ::Variable_Union1_out p3) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 28ac2315757..fef0f2885fe 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -270,7 +270,7 @@ int test_basic_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ @@ -346,18 +346,17 @@ int test_basic_invocations (Test * test_object) mp2->_remove_ref (); mp3->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_basic_invocations"); + ex._tao_print_exception ("test_basic_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_basic_invocations: caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -467,7 +466,7 @@ int test_boxed_string_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ @@ -512,19 +511,18 @@ int test_boxed_string_invocations (Test * test_object) p3->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_boxed_string_invocations"); + ex._tao_print_exception ("test_boxed_string_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_boxed_string_invocations: " "caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -616,7 +614,7 @@ int test_boxed_sequence_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ @@ -681,19 +679,18 @@ int test_boxed_sequence_invocations (Test * test_object) p2->_remove_ref (); p3->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_boxed_sequence_invocations"); + ex._tao_print_exception ("test_boxed_sequence_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_boxed_sequence_invocations: " "caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -807,7 +804,7 @@ int test_boxed_struct_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ @@ -936,19 +933,18 @@ int test_boxed_struct_invocations (Test * test_object) p5->_remove_ref (); p6->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_boxed_struct_invocations"); + ex._tao_print_exception ("test_boxed_struct_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_boxed_struct_invocations: " "caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -1032,7 +1028,7 @@ int test_boxed_array_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ // Array (fixed) @@ -1176,19 +1172,18 @@ int test_boxed_array_invocations (Test * test_object) p6->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_boxed_array_invocations"); + ex._tao_print_exception ("test_boxed_array_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_boxed_array_invocations: " "caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -1280,7 +1275,7 @@ int test_boxed_union_invocations (Test * test_object) { int fail = 0; - ACE_TRY_NEW_ENV + try { //============================================================ // Union (fixed) @@ -1407,19 +1402,18 @@ int test_boxed_union_invocations (Test * test_object) p6->_remove_ref (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "test_boxed_union_invocations"); + ex._tao_print_exception ("test_boxed_union_invocations"); fail = 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_boxed_union_invocations: " "caught a C++ exception \n")); fail = 1; } - ACE_ENDTRY; return fail; } @@ -1431,22 +1425,18 @@ main (int argc, char *argv[]) CORBA::ORB_var orb; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY_EX (init) + try { - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (init); + orb = CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; // Obtain reference to the object. CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (init); + orb->string_to_object(ior); - test_object = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (init); + test_object = Test::_narrow(tmp.in ()); if (CORBA::is_nil (test_object.in ())) { @@ -1456,18 +1446,17 @@ main (int argc, char *argv[]) 1); } } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Initialization failure"); + ex._tao_print_exception ("Initialization failure"); return 1; } - ACE_CATCHALL + catch (...) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Initialization failure: caught a C++ exception \n")); return 1; } - ACE_ENDTRY; int fail = 0; @@ -1496,23 +1485,19 @@ main (int argc, char *argv[]) fail += test_boxed_union_invocations (test_object.in ()); - ACE_TRY_EX (cleanup) + try { test_object->shutdown (); - ACE_TRY_CHECK_EX (cleanup); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); orb->destroy (); - ACE_TRY_CHECK_EX (cleanup); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return (fail) ? 1 : 0; } diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index f650fa42a83..48ae95f73b4 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +72,7 @@ main (int argc, char *argv[]) Test_var test = test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -90,16 +90,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp index 346ca6ae926..f02243113b2 100644 --- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp @@ -131,7 +131,7 @@ testBug1459 (int , ACE_TCHAR *[]) } catch(const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Unhandled exception caught"); + ex._tao_print_exception ("Unhandled exception caught"); return -1; } catch(...) diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp index fe629b8d48d..750c68132fe 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp @@ -101,8 +101,7 @@ int DllOrb::init (int argc, char *argv[]) } catch(CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) init failed:")); + ex._tao_print_exception (ACE_TEXT ("(%P|%t) init failed:")); return -1; } catch(...) @@ -144,8 +143,7 @@ int DllOrb::fini (void) } catch(CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) fini failed:")); + ex._tao_print_exception (ACE_TEXT ("(%P|%t) fini failed:")); return -1; } catch(...) @@ -171,8 +169,9 @@ int DllOrb::fini (void) } catch(CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) init failed to destroy the orb:")); + ex._tao_print_exception ( + ACE_TEXT ( + "(%P|%t) init failed to destroy the orb:")); return -1; } @@ -219,8 +218,7 @@ int DllOrb::svc (void) } catch(CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) svc - orb->run() failed:")); + ex._tao_print_exception (ACE_TEXT ("(%P|%t) svc - orb->run() failed:")); return -1; } catch(...) 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 e7a9e83d1bc..38f84d0b505 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 @@ -111,8 +111,7 @@ Service_Config_ORB_DLL::svc (void) ACE_ASSERT (this->worker_.get () != 0); ACE_ASSERT (this->argv_.get () != 0); - ACE_DECLARE_NEW_ENV; - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %@ %s is active, argv[%d]=\'%s\'\n"), @@ -122,8 +121,7 @@ Service_Config_ORB_DLL::svc (void) this->argv_->buf ())); int ret = this->worker_->test_main (this->argv_->argc (), - this->argv_->argv () - ACE_ENV_ARG_PARAMETER); + this->argv_->argv ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %@ %s bows out - so long, cruel world! (%d)\n"), @@ -132,14 +130,13 @@ Service_Config_ORB_DLL::svc (void) ret)); return ret; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, ACE_TEXT("Failure:")); + ex._tao_print_exception (ACE_TEXT("Failure:")); ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Aborting.\n")), -1); } - ACE_ENDTRY; } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index 014c185315d..7ce803ca818 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -33,7 +33,7 @@ public: Abstract_Worker (const char* ior); virtual ~Abstract_Worker (void); virtual int test_main (int argc, - ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_TCHAR *argv[]) = 0; virtual const ACE_TCHAR * kind (void) const = 0; protected: ACE_TString ior_file_; @@ -47,7 +47,7 @@ class Server_Worker : public Abstract_Worker public: Server_Worker (); ~Server_Worker (void); - int test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS); + int test_main (int argc, ACE_TCHAR *argv[]); const ACE_TCHAR * kind (void) const; private: @@ -62,7 +62,7 @@ class Client_Worker : public Abstract_Worker public: Client_Worker (); ~Client_Worker (void); - int test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS); + int test_main (int argc, ACE_TCHAR *argv[]); const ACE_TCHAR * kind (void) const; private: 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 74f42b24826..69430847582 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 @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 5fb32ced93a..50d78473955 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -44,12 +44,12 @@ Client_Worker::parse_args (int argc, ACE_TCHAR *argv[]) } int -Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) +Client_Worker::test_main (int argc, ACE_TCHAR *argv[]) { 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); + CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (), cvt.get_ASCII_argv ()); if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -64,9 +64,9 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n"))); ACE_OS::sleep (1); - ACE_TRY + try { - co = orb->string_to_object(ior_file_.c_str () ACE_ENV_ARG_PARAMETER); + co = orb->string_to_object(ior_file_.c_str ()); if (co == 0) { @@ -77,7 +77,7 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) CORBA::Object_var tmp (co); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -102,22 +102,21 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) attempts_left = 0; // We're done here! } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { if (!attempts_left) - ACE_RE_THROW; + throw; - ACE_PRINT_EXCEPTION (ex, "Temporary problem encountered"); + ex._tao_print_exception ("Temporary problem encountered"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Client was too quick. Pausing ") ACE_TEXT ("while the server gets ready.\n"))); ACE_OS::sleep (5); } - ACE_ENDTRY; } - orb->shutdown (0 ACE_ENV_ARG_PARAMETER); + orb->shutdown (0); orb->destroy (); 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 359a2a30d26..e44275ac8eb 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -53,20 +53,20 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[]) // int -Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) +Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) { // Making sure there are no stale ior files to confuse a client ACE_OS::unlink (ior_file_.c_str ()); 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); + cvt.get_ASCII_argv ()); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,18 +87,16 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) PortableServer::ServantBase_var owner_transfer(hello_impl); PortableServer::ObjectId_var id = - root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (hello_impl); CORBA::Object_var hello_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test::Hello_var hello = - Test::Hello::_narrow (hello_obj.in () - ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow (hello_obj.in ()); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); poa_manager->activate (); @@ -120,12 +118,12 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n"))); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); // During normal test execution the ORB would have been destroyed // by a request from the client. - // orb->shutdown (0 ACE_ENV_ARG_PARAMETER); + // orb->shutdown (0); orb->destroy (); diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index 0952defe3b5..61ad9caa6d5 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -30,19 +30,17 @@ test_with_regular_poa_manager (int argc, int destroy_orb, int destroy_poa) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -51,7 +49,7 @@ test_with_regular_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } if (destroy_orb) @@ -59,12 +57,10 @@ test_with_regular_poa_manager (int argc, orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } - ACE_ENDTRY; return 0; } @@ -77,19 +73,17 @@ test_with_funky_poa_manager (int argc, int destroy_poa, int funky_poa_manager) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (funky_poa_manager) { @@ -101,7 +95,7 @@ test_with_funky_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } if (destroy_orb) @@ -109,12 +103,10 @@ test_with_funky_poa_manager (int argc, orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception raised"); + ex._tao_print_exception ("Exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp index 189e571d126..c96d9c59137 100644 --- a/TAO/tests/ORB_init/ORB_init.cpp +++ b/TAO/tests/ORB_init/ORB_init.cpp @@ -23,15 +23,14 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { const char orbid[] = "mighty_orb"; CORBA::ORB_ptr my_orb = CORBA::ORB::_nil(); { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid); my_orb = orb.in (); @@ -47,7 +46,7 @@ main (int argc, char *argv[]) // used in that scope. // ------------------------------------------------------------- - orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid); // This isn't portable, but TAO implements an ORB_ptr as a // pointer so we're okay. @@ -83,7 +82,7 @@ main (int argc, char *argv[]) orb->destroy (); - orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid); // This isn't portable, but TAO implements an ORB_ptr as a // pointer so we're okay. @@ -108,7 +107,7 @@ main (int argc, char *argv[]) "\n", orbid)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // ------------------------------------------------------------- @@ -118,7 +117,7 @@ main (int argc, char *argv[]) // ------------------------------------------------------------- CORBA::Object_var object = - orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); + orb->string_to_object (IOR); // ------------------------------------------------------------- // Initialize another two ORBs but don't explicitly destroy them @@ -126,10 +125,10 @@ main (int argc, char *argv[]) // clean-up. // ------------------------------------------------------------- CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 2"); CORBA::ORB_var orb3 = - CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 3"); // ------------------------------------------------------------- // Now try to perform an operation using the destroyed ORB @@ -141,7 +140,7 @@ main (int argc, char *argv[]) orb->destroy (); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // If we get here, then something went wrong. A // CORBA::OBJECT_NOT_EXIST() exception should have been thrown!. @@ -155,9 +154,9 @@ main (int argc, char *argv[]) "\n", orbid)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, exc) + catch (const CORBA::OBJECT_NOT_EXIST& exc) { // Do something with the exception to make sure it actually // exists. If it doesn't exist then there is something wrong @@ -170,10 +169,9 @@ main (int argc, char *argv[]) "This exception was expected. It is safe to ignore it.\n", exc._rep_id ())); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught unexpected exception:"); + ex._tao_print_exception ("Caught unexpected exception:"); ACE_DEBUG ((LM_ERROR, @@ -182,7 +180,6 @@ main (int argc, char *argv[]) return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "\n" diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp index e4c52394c25..284d0d79b4e 100644 --- a/TAO/tests/ORB_init/Portspan/server.cpp +++ b/TAO/tests/ORB_init/Portspan/server.cpp @@ -5,17 +5,14 @@ int main( int argc, char *argv[] ) { - ACE_TRY_NEW_ENV + try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); - PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in() - ACE_ENV_ARG_PARAMETER); + PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); PortableServer::POAManager_var man = poa->the_POAManager(); @@ -23,18 +20,16 @@ main( int argc, char *argv[] ) simple_i simp; - PortableServer::ObjectId_var objId = poa->activate_object(&simp - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var objId = poa->activate_object(&simp); orb->run(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in main():"); + ex._tao_print_exception ("Exception in main():"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp index c0ae870a550..5be30781a60 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.cpp +++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp @@ -32,7 +32,6 @@ simple_i::~simple_i (void) } void simple_i::test ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h index 23faf5eb717..581c88f8aa0 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.h +++ b/TAO/tests/ORB_init/Portspan/simpleI.h @@ -39,7 +39,6 @@ public: virtual ~simple_i (void); virtual void test ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index 86c5b373b39..69b521e5e28 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -11,16 +11,16 @@ ACE_RCSID (Hello, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,29 +51,26 @@ main (int argc, char *argv[]) 0); // Just run the ORB for a minute.. - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - shutting down the ORB\n")); - orb->shutdown (1 - ACE_ENV_ARG_PARAMETER); + orb->shutdown (1); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Finished shutting down the ORB\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test successful.. \n")); diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index 4c7152a2134..3287952f4e2 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -32,8 +32,7 @@ ORT_test_IORInterceptor::destroy (void) void ORT_test_IORInterceptor::establish_components ( - PortableInterceptor::IORInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::IORInfo_ptr /* info */) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->establish_count_; @@ -45,8 +44,7 @@ ORT_test_IORInterceptor::establish_components ( void ORT_test_IORInterceptor::components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->components_establish_count_; @@ -73,15 +71,13 @@ ORT_test_IORInterceptor::components_established ( PortableInterceptor::ObjectReferenceFactory_var orf = tmp; - info->current_factory (orf.in () - ACE_ENV_ARG_PARAMETER); + info->current_factory (orf.in ()); } void ORT_test_IORInterceptor::adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -91,8 +87,7 @@ ORT_test_IORInterceptor::adapter_manager_state_changed ( void ORT_test_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index 90e0dbc6d02..40a7a2968f3 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -56,25 +56,21 @@ public: /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index 29ccff8e367..7d0dc6b4a6f 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -22,6 +22,5 @@ void ORT_test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp index 45cb966bc7e..0373edccd29 100644 --- a/TAO/tests/ORT/ObjectReferenceFactory.cpp +++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp @@ -26,8 +26,7 @@ ObjectReferenceFactory::~ObjectReferenceFactory (void) CORBA::Object_ptr ObjectReferenceFactory::make_object ( const char *repository_id, - const PortableInterceptor::ObjectId & id - ACE_ENV_ARG_DECL) + const PortableInterceptor::ObjectId & id) { ACE_ASSERT (repository_id != 0); @@ -35,6 +34,5 @@ ObjectReferenceFactory::make_object ( "Invoked custom ObjectReferenceFactory::make_object()\n")); return this->old_orf_->make_object (repository_id, - id - ACE_ENV_ARG_PARAMETER); + id); } diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h index a6fbe9cdabd..354a7b38a0f 100644 --- a/TAO/tests/ORT/ObjectReferenceFactory.h +++ b/TAO/tests/ORT/ObjectReferenceFactory.h @@ -55,8 +55,7 @@ class ObjectReferenceFactory //@{ virtual CORBA::Object_ptr make_object ( const char *repository_id, - const PortableInterceptor::ObjectId & id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const PortableInterceptor::ObjectId & id); //@} protected: diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index ec5915d4aec..13c12219c2b 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -13,26 +13,22 @@ ACE_RCSID (ORT, void ServerORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr /* info */) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - info->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); + info->resolve_initial_references ("POACurrent"); PortableServer::Current_var poa_current = - PortableServer::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (obj.in ()); ACE_ASSERT (!CORBA::is_nil (poa_current.in ())); @@ -53,8 +49,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = tmp; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); // Create and register the test's IORInterceptor @@ -71,6 +66,5 @@ ServerORBInitializer::post_init ( PortableInterceptor::IORInterceptor_var ior_interceptor = ort_test_interceptor; - info->add_ior_interceptor (ior_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_ior_interceptor (ior_interceptor.in ()); } diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h index d4736dc8efb..6f5d85861ab 100644 --- a/TAO/tests/ORT/ServerORBInitializer.h +++ b/TAO/tests/ORT/ServerORBInitializer.h @@ -51,14 +51,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp index 567b82b7e8e..6e4b4eee5ac 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.cpp +++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp @@ -33,8 +33,7 @@ ServerRequestInterceptor::destroy (void) void ServerRequestInterceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -42,8 +41,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -58,18 +56,16 @@ ServerRequestInterceptor::receive_request ( PortableServer::POA_var poa; - ACE_TRY + try { poa = this->poa_current_->get_POA (); } - ACE_CATCH (PortableServer::Current::NoContext, ex) + catch (const PortableServer::Current::NoContext& ex) { - ACE_PRINT_EXCEPTION (ex, - "ServerRequestInterceptor::receive_request"); + ex._tao_print_exception ("ServerRequestInterceptor::receive_request"); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; PortableServer::POA_var parent_poa = poa->the_parent (); @@ -123,16 +119,14 @@ ServerRequestInterceptor::receive_request ( void ServerRequestInterceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -140,8 +134,7 @@ ServerRequestInterceptor::send_exception ( void ServerRequestInterceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index 0651e82cd10..afa56c964ca 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -72,31 +72,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index e62b995b750..b14e2a4a546 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -36,21 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "client_sum_orb"); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); ObjectReferenceTemplate::ORT_test_var server = - ObjectReferenceTemplate::ORT_test::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + ObjectReferenceTemplate::ORT_test::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) { @@ -68,13 +66,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ORT test on client side :"); + ex._tao_print_exception ("ORT test on client side :"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp index ae3b94a24cd..53c1aa8df89 100644 --- a/TAO/tests/ORT/server.cpp +++ b/TAO/tests/ORT/server.cpp @@ -41,8 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr tmp; @@ -52,26 +51,22 @@ int main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = tmp; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "ORT Test ORB" - ACE_ENV_ARG_PARAMETER); + "ORT Test ORB"); if (parse_args (argc, argv) != 0) return -1; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Narrow PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Check for nil references if (CORBA::is_nil (root_poa.in ())) @@ -93,40 +88,33 @@ int main (int argc, char *argv[]) PortableServer::POA_var first_poa = root_poa->create_POA ("FIRST_POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::POA_var second_poa = first_poa->create_POA ("SECOND_POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::POA_var third_poa = second_poa->create_POA ("THIRD_POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::POA_var fourth_poa = third_poa->create_POA ("FOURTH_POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); ORT_test_i ort_test_impl (orb.in ()); PortableServer::ObjectId_var oid = - fourth_poa->activate_object (&ort_test_impl - ACE_ENV_ARG_PARAMETER); + fourth_poa->activate_object (&ort_test_impl); - obj = fourth_poa->servant_to_reference (&ort_test_impl - ACE_ENV_ARG_PARAMETER); + obj = fourth_poa->servant_to_reference (&ort_test_impl); // Convert the object reference to a string format. CORBA::String_var ior = - orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); // Dump it to a file. if (ior_output_file != 0) @@ -146,13 +134,11 @@ int main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ORT test server:"); + ex._tao_print_exception ("ORT test server:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 4cd15761689..ac699174f43 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -12,17 +12,16 @@ Loader::Loader (void) CORBA::Object_ptr Loader::create_object (CORBA::ORB_ptr orb, int, - char * [] - ACE_ENV_ARG_DECL) + char * []) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var mgr = poa->the_POAManager (); @@ -38,10 +37,9 @@ Loader::create_object (CORBA::ORB_ptr orb, return obj._retn (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; return CORBA::Object::_nil (); } diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index 73b4c5708f4..47c39d4e32c 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -32,8 +32,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - char *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + char *argv []) ACE_THROW_SPEC ((CORBA::SystemException)); // Create a new instance }; diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp index 008a4844bab..7271b79e988 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -27,8 +27,8 @@ Test_i::destroy (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (oid.in ()); } PortableServer::POA_ptr diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index aed3134c350..5584458efcb 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -14,7 +14,7 @@ main (int, char *[]) int niterations = 10; int norbs = 10; - ACE_TRY_NEW_ENV + try { for (int i = 0; i != niterations; ++i) { @@ -25,14 +25,13 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, 0, buf); CORBA::Object_var object = - orb->string_to_object ("DLL:Test_Object" - ACE_ENV_ARG_PARAMETER); + orb->string_to_object ("DLL:Test_Object"); Test_var test = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); CORBA::Long count = test->instance_count (); @@ -55,26 +54,23 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, 0, buf); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "main()"); + ex._tao_print_exception ("main()"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index a2d2e6b3d38..964ba9531e7 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -34,28 +34,24 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) == -1) return -1; // Connect to the server CORBA::Object_var tmp = - orb->string_to_object(ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); - Server_var server = Server::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + Server_var server = Server::_narrow (tmp.in ()); // Create object instances // This portion of the test was given by Petr Tuma and am just @@ -79,8 +75,7 @@ main (int argc, char *argv []) iAddSize = iSize - iOldSize; server->CreateExtra (iAddSize, - vAddition.out () - ACE_ENV_ARG_PARAMETER); + vAddition.out ()); vServers->length (iSize); @@ -108,19 +103,17 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Call delete on the server \n")); - server->DeleteExtra (vServers.in () - ACE_ENV_ARG_PARAMETER); + server->DeleteExtra (vServers.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown \n")); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); + ex._tao_print_exception (""); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 773c9911ad2..8b618bb40f1 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -13,12 +13,10 @@ public: CORBA::ORB_ptr orb); void CreateExtra (CORBA::ULong length, - ServerSequence_out seq - ACE_ENV_ARG_DECL) + ServerSequence_out seq) ACE_THROW_SPEC ((CORBA::SystemException)); - void DeleteExtra (const ServerSequence &seq - ACE_ENV_ARG_DECL) + void DeleteExtra (const ServerSequence &seq) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -43,8 +41,7 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa, /// Servant implementations void ServerServant::CreateExtra (CORBA::ULong len, - ServerSequence_out seq - ACE_ENV_ARG_DECL) + ServerSequence_out seq) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -79,8 +76,7 @@ ServerServant::CreateExtra (CORBA::ULong len, void -ServerServant::DeleteExtra (const ServerSequence &seq - ACE_ENV_ARG_DECL) +ServerServant::DeleteExtra (const ServerSequence &seq) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -112,7 +108,7 @@ void ServerServant::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } /******************************************************/ @@ -148,27 +144,23 @@ int main (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; if (parse_args (argc, argv) == -1) return -1; - ACE_TRY + try { // Initialize the broker CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var vRootPOABase = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (vRootPOABase.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (vRootPOABase.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -193,8 +185,7 @@ main (int argc, char *argv []) // Announce the server CORBA::String_var obj_ref = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -212,17 +203,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index 0e3b1fed94d..97bb5c276d9 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -163,13 +163,11 @@ run (char* buf, size_t bufsize, int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int n = 64; int lo = 128; @@ -246,11 +244,10 @@ main (int argc, char *argv[]) return 1; delete[] buf; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "OctetSeq"); + ex._tao_print_exception ("OctetSeq"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 267bf2256ec..757322add9c 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -57,19 +57,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Database_var server = - Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Database::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -125,8 +125,7 @@ main (int argc, char *argv[]) server->set (Test::Index (j), elements[j], token, - returned_token - ACE_ENV_ARG_PARAMETER); + returned_token); if (token != returned_token) { @@ -139,7 +138,7 @@ main (int argc, char *argv[]) } CORBA::ULong crc_remote = - server->get_crc (idx ACE_ENV_ARG_PARAMETER); + server->get_crc (idx); CORBA::ULong crc_local = ACE::crc32 (elements[idx].get_buffer (), @@ -163,13 +162,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index ecec923fba0..81cae9d601b 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -38,13 +38,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,7 +52,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -68,7 +68,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -91,18 +91,16 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index ff91ed3cd51..c7ba1fd796d 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -18,12 +18,11 @@ void Database_i::set (Test::Index i, const Test::OctetSeq& seq, CORBA::Double verification_token, - CORBA::Double_out returned_token - ACE_ENV_ARG_DECL) + CORBA::Double_out returned_token) ACE_THROW_SPEC ((Test::OutOfRange)) { if (i >= this->max_range_) - ACE_THROW (Test::OutOfRange (0, this->max_range_)); + throw Test::OutOfRange (0, this->max_range_); returned_token = verification_token; @@ -45,8 +44,7 @@ Database_i::set (Test::Index i, } Test::OctetSeq* -Database_i::get (Test::Index i - ACE_ENV_ARG_DECL) +Database_i::get (Test::Index i) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) @@ -60,8 +58,7 @@ Database_i::get (Test::Index i } CORBA::ULong -Database_i::get_crc (Test::Index i - ACE_ENV_ARG_DECL) +Database_i::get_crc (Test::Index i) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h index f3f02bef367..4d7b846d38d 100644 --- a/TAO/tests/OctetSeq/test_i.h +++ b/TAO/tests/OctetSeq/test_i.h @@ -35,16 +35,13 @@ public: void set (Test::Index i, const Test::OctetSeq& seq, CORBA::Double verification_token, - CORBA::Double_out returned_token - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Double_out returned_token) ACE_THROW_SPEC ((Test::OutOfRange)); - Test::OctetSeq* get (Test::Index i - ACE_ENV_ARG_DECL_NOT_USED) + Test::OctetSeq* get (Test::Index i) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); - CORBA::ULong get_crc (Test::Index i - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong get_crc (Test::Index i) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); void shutdown (void) diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp index 2304ac6c354..bfd8274359a 100644 --- a/TAO/tests/Ondemand_Write/Hello.cpp +++ b/TAO/tests/Ondemand_Write/Hello.cpp @@ -25,5 +25,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp index 85546533fc5..c48b9ee41fb 100644 --- a/TAO/tests/Ondemand_Write/client.cpp +++ b/TAO/tests/Ondemand_Write/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -69,13 +69,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp index 245c288e5c8..8c998950dd3 100644 --- a/TAO/tests/Ondemand_Write/server.cpp +++ b/TAO/tests/Ondemand_Write/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,17 +89,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index 4768a8bd14b..16db8fe73e2 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -13,11 +13,10 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb, } void -Oneway_Buffering::receive_data (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) +Oneway_Buffering::receive_data (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER); + this->admin_->request_received (the_payload.length ()); } void @@ -37,5 +36,5 @@ void Oneway_Buffering::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index b2b6764a311..9b32c9e4d58 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -18,8 +18,7 @@ public: Test::Oneway_Buffering_Admin_ptr admin); // = The skeleton methods - virtual void receive_data (const Test::Payload &the_payload - ACE_ENV_ARG_DECL) + virtual void receive_data (const Test::Payload &the_payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void flush (void) diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index 59af5adc056..1525b0f0905 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -27,8 +27,7 @@ Oneway_Buffering_Admin::bytes_received_count (void) } void -Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length - ACE_ENV_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length) ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; @@ -45,5 +44,5 @@ void Oneway_Buffering_Admin::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index 80825e37778..02272fd53bf 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -23,8 +23,7 @@ public: virtual CORBA::ULong bytes_received_count (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void request_received (CORBA::ULong payload_length - ACE_ENV_ARG_DECL) + virtual void request_received (CORBA::ULong payload_length) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void flush (void) diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index 097b71236eb..830ab7969b6 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) oneway_buffering_admin_impl->_this (); CORBA::String_var ior = - orb->object_to_string (oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_buffering_admin.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,17 +87,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in admin:"); + ex._tao_print_exception ("Exception caught in admin:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index 18617f80bbe..4ad22187b4c 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -91,44 +91,40 @@ parse_args (int argc, char *argv[]) int run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin); int run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin); int run_timeout_reactive (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin); int run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin); int main (int argc, char *argv[]) { int test_failed = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); Test::Oneway_Buffering_var oneway_buffering = - Test::Oneway_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Buffering::_narrow(tmp.in ()); if (CORBA::is_nil (oneway_buffering.in ())) { @@ -139,10 +135,10 @@ main (int argc, char *argv[]) } tmp = - orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(admin_ior); Test::Oneway_Buffering_Admin_var oneway_buffering_admin = - Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Buffering_Admin::_narrow(tmp.in ()); if (CORBA::is_nil (oneway_buffering_admin.in ())) { @@ -159,8 +155,7 @@ main (int argc, char *argv[]) test_failed = run_message_count (orb.in (), oneway_buffering.in (), - oneway_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin.in ()); } else if (run_timeout_test) { @@ -169,8 +164,7 @@ main (int argc, char *argv[]) test_failed = run_timeout (orb.in (), oneway_buffering.in (), - oneway_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin.in ()); } else if (run_timeout_reactive_test) { @@ -179,8 +173,7 @@ main (int argc, char *argv[]) test_failed = run_timeout_reactive (orb.in (), oneway_buffering.in (), - oneway_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin.in ()); } else if (run_buffer_size_test) { @@ -189,8 +182,7 @@ main (int argc, char *argv[]) test_failed = run_buffer_size (orb.in (), oneway_buffering.in (), - oneway_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin.in ()); } else { @@ -204,13 +196,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return test_failed; } @@ -219,14 +209,13 @@ int configure_policies (CORBA::ORB_ptr orb, const TAO::BufferingConstraint &buffering_constraint, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_out flusher - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_out flusher) { CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -242,15 +231,12 @@ configure_policies (CORBA::ORB_ptr orb, CORBA::PolicyList policies (2); policies.length (2); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); policies[1]->destroy (); @@ -265,25 +251,22 @@ configure_policies (CORBA::ORB_ptr orb, policies.length (1); policies[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); object = oneway_buffering->_set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); flusher = - Test::Oneway_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Buffering::_narrow (object.in ()); return 0; } void -sync_server (Test::Oneway_Buffering_ptr flusher - ACE_ENV_ARG_DECL) +sync_server (Test::Oneway_Buffering_ptr flusher) { // Get back in sync with the server... flusher->flush (); @@ -294,13 +277,12 @@ int 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 - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin) { ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; - sync_server (flusher ACE_ENV_ARG_PARAMETER); + sync_server (flusher); CORBA::ULong send_count = oneway_buffering_admin->request_count (); @@ -315,14 +297,14 @@ run_liveness_test (CORBA::ORB_ptr orb, int depth = 0; for (int i = 0; i != liveness_test_iterations; ++i) { - oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload); send_count++; CORBA::ULong receive_count = oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Once the system has sent enough messages we don't // expect it to fall too far behind, i.e. at least 90% of the @@ -339,12 +321,12 @@ run_liveness_test (CORBA::ORB_ptr orb, "expected %u\n", i, receive_count, expected)); - sync_server (flusher ACE_ENV_ARG_PARAMETER); + sync_server (flusher); } if (depth++ == LIVENESS_MAX_DEPTH) { - sync_server (flusher ACE_ENV_ARG_PARAMETER); + sync_server (flusher); depth = 0; } @@ -357,8 +339,7 @@ run_liveness_test (CORBA::ORB_ptr orb, int run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; @@ -369,8 +350,7 @@ run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - oneway_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + oneway_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -383,7 +363,7 @@ run_message_count (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (flusher.in ()); CORBA::ULong initial_receive_count = oneway_buffering_admin->request_count (); @@ -398,14 +378,14 @@ run_message_count (CORBA::ORB_ptr orb, while (1) { - oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload); send_count++; CORBA::ULong receive_count = oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong iteration_count = send_count - initial_receive_count; @@ -442,8 +422,7 @@ run_message_count (CORBA::ORB_ptr orb, run_liveness_test (orb, oneway_buffering, flusher.in (), - oneway_buffering_admin - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -454,8 +433,7 @@ run_message_count (CORBA::ORB_ptr orb, int run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -466,8 +444,7 @@ run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - oneway_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + oneway_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -480,7 +457,7 @@ run_timeout (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (flusher.in ()); CORBA::ULong initial_receive_count = oneway_buffering_admin->request_count (); @@ -496,14 +473,14 @@ run_timeout (CORBA::ORB_ptr orb, ACE_Time_Value start = ACE_OS::gettimeofday (); while (1) { - oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload); send_count++; CORBA::ULong receive_count = oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -539,8 +516,7 @@ run_timeout (CORBA::ORB_ptr orb, int liveness_test_failed = run_liveness_test (orb, oneway_buffering, flusher.in (), - oneway_buffering_admin - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -552,8 +528,7 @@ run_timeout (CORBA::ORB_ptr orb, int run_timeout_reactive (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -564,8 +539,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - oneway_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + oneway_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -578,7 +552,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (flusher.in ()); CORBA::ULong initial_receive_count = oneway_buffering_admin->request_count (); @@ -594,7 +568,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, ACE_Time_Value start = ACE_OS::gettimeofday (); for (int j = 0; j != 20; ++j) { - oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload); send_count++; } while (1) @@ -603,7 +577,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, oneway_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; @@ -640,8 +614,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int liveness_test_failed = run_liveness_test (orb, oneway_buffering, flusher.in (), - oneway_buffering_admin - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -653,8 +626,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, - Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL) + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; @@ -665,8 +637,7 @@ run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - oneway_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + oneway_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -679,7 +650,7 @@ run_buffer_size (CORBA::ORB_ptr orb, CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (flusher.in ()); CORBA::ULong initial_bytes_received = oneway_buffering_admin->bytes_received_count (); @@ -694,14 +665,14 @@ run_buffer_size (CORBA::ORB_ptr orb, while (1) { - oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = oneway_buffering_admin->bytes_received_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong payload_delta = bytes_sent - initial_bytes_received; @@ -742,8 +713,7 @@ run_buffer_size (CORBA::ORB_ptr orb, int liveness_test_failed = run_liveness_test (orb, oneway_buffering, flusher.in (), - oneway_buffering_admin - ACE_ENV_ARG_PARAMETER); + oneway_buffering_admin); if (liveness_test_failed) test_failed = 1; diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 9bdfa92be29..bd0c5a289e5 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -43,16 +43,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,10 +66,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Oneway_Buffering_Admin_var admin = - Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Buffering_Admin::_narrow(tmp.in ()); if (CORBA::is_nil (admin.in ())) { @@ -90,7 +90,7 @@ main (int argc, char *argv[]) oneway_buffering_impl->_this (); CORBA::String_var ior = - orb->object_to_string (oneway_buffering.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_buffering.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -108,17 +108,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server:"); + ex._tao_print_exception ("Exception caught in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 7834abc95ba..354b30c8bc6 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -21,25 +21,21 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (int i = 0; i != 1; ++i) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) sending oneways...\n")); - this->sender_->send_ready_message (this->us_.in () - ACE_ENV_ARG_PARAMETER); + this->sender_->send_ready_message (this->us_.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught Exception"); + ex._tao_print_exception ("Caught Exception"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 57a87124294..d9d5b1c20a6 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -31,7 +31,7 @@ Receiver_i::receive_call (void) } CORBA::Long -Receiver_i::get_call_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Receiver_i::get_call_count ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->iteration_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 69a03bb0dbd..9e4cf2f22e3 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -16,7 +16,7 @@ Sender_i::~Sender_i (void) void Sender_i::active_objects (CORBA::Short no_threads - ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER */ ) + /* */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; @@ -24,8 +24,7 @@ Sender_i::active_objects (CORBA::Short no_threads void -Sender_i::send_ready_message (Test::Receiver_ptr receiver - ACE_ENV_ARG_DECL) +Sender_i::send_ready_message (Test::Receiver_ptr receiver) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -44,7 +43,7 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver } void -Sender_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Sender_i::ping ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { return; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 36dc35b5b95..57ea386f763 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -33,12 +33,10 @@ public: virtual ~Sender_i (void); // = The skeleton methods - virtual void active_objects (CORBA::Short ao - ACE_ENV_ARG_DECL) + virtual void active_objects (CORBA::Short ao) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_ready_message (Test::Receiver_ptr receiver - ACE_ENV_ARG_DECL) + virtual void send_ready_message (Test::Receiver_ptr receiver) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void ping (void) diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp index ce64de12aba..4496c2e7581 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -17,18 +17,16 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // run the test for at most 60 seconds... ACE_Time_Value tv (60, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index ca2473dbf3e..a1a34fda8af 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -37,13 +37,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -51,7 +51,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -61,10 +61,10 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Sender_var sender = - Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Sender::_narrow(tmp.in ()); if (CORBA::is_nil (sender.in ())) { @@ -98,7 +98,7 @@ 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); + sender->active_objects ((CORBA::Short) 2); if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1) { @@ -117,13 +117,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index f8bdf0d2bf3..0856678ad4a 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -69,7 +69,7 @@ main (int argc, char *argv[]) sender_impl->_this (); CORBA::String_var ior = - orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (sender.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -94,17 +94,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp index 9269b215a44..1725984fb2a 100644 --- a/TAO/tests/Optimized_Connection/oc_client.cpp +++ b/TAO/tests/Optimized_Connection/oc_client.cpp @@ -39,19 +39,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -71,17 +71,15 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCH (CORBA::TRANSIENT, e) + catch (const CORBA::TRANSIENT& ) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected CORBA::TRANSIENT caught\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index 7fffa5a0c1b..4cda3f582df 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -80,8 +80,7 @@ public: ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, - PortableServer::ServantLocator::Cookie & - ACE_ENV_ARG_DECL) + PortableServer::ServantLocator::Cookie &) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -89,8 +88,7 @@ public: PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie, - PortableServer::Servant - ACE_ENV_ARG_DECL) + PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)); test_i servant_; @@ -105,8 +103,7 @@ Servant_Locator::Servant_Locator (PortableServer::POA_ptr poa) Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *op, - PortableServer::ServantLocator::Cookie & - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::ServantLocator::Cookie &) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -139,8 +136,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *op, PortableServer::ServantLocator::Cookie, - PortableServer::Servant - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)) { ++postCount; @@ -164,21 +160,18 @@ main (int argc, char **argv) { int retval = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -190,67 +183,58 @@ main (int argc, char **argv) policies.length (current_length + 1); policies[current_length++] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); policies.length (current_length + 1); policies[current_length++] = - root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN - ACE_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN); policies.length (current_length + 1); policies[current_length++] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); Servant_Locator* servant_locator = new Servant_Locator(child_poa.in ()) ; - child_poa->set_servant_manager (servant_locator - ACE_ENV_ARG_PARAMETER); + child_poa->set_servant_manager (servant_locator); PortableServer::ObjectId_var objectID = PortableServer::string_to_ObjectId ("object"); CORBA::Object_var objectREF = child_poa->create_reference_with_id (objectID.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var testObject = - test::_narrow (objectREF.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (objectREF.in ()); testObject->normal(); bool caught = false; - ACE_TRY + try { testObject->exceptional(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n")); caught = true; } - ACE_ENDTRY; if (!caught) ++errorCount; caught = false; - ACE_TRY + try { testObject->notexisting(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n")); caught = true; } - ACE_ENDTRY; if (!caught) ++errorCount; if (!errorCount) @@ -263,12 +247,11 @@ main (int argc, char **argv) } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); retval = -1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index 75a3fccd76d..a81a636773a 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -25,46 +25,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var object; object = - orb->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = - PortableServer::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (object.in ()); object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); ACE_DEBUG ((LM_DEBUG, "%s successful\n", argv[0])); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp index c601d1dfb1f..9999f8b1483 100644 --- a/TAO/tests/POA/Deactivate_Object/server.cpp +++ b/TAO/tests/POA/Deactivate_Object/server.cpp @@ -10,16 +10,16 @@ ACE_RCSID (Hello, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,29 +38,26 @@ main (int argc, char *argv[]) poa_manager->activate (); - PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl); - CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in ()); - PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in () ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in ()); // Invoke reference_to_servant(). Should retrieve servant. PortableServer::ServantBase_var servant = - root_poa->reference_to_servant (obj_var.in () - ACE_ENV_ARG_PARAMETER); + root_poa->reference_to_servant (obj_var.in ()); // Assert correctness. ACE_ASSERT (hello_impl == servant.in()); - root_poa->deactivate_object (new_obj_id.in () ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (new_obj_id.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp index 4e858447ae1..81ae916d22b 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp @@ -29,7 +29,7 @@ void test_get_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Getting the servant manager should give a wrong policy exception // exception @@ -38,14 +38,13 @@ test_get_servant_manager (PortableServer::POA_ptr poa) ACE_UNUSED_ARG (servant_manager); } - ACE_CATCH (PortableServer::POA::WrongPolicy, ex) + catch (const PortableServer::POA::WrongPolicy& ) { succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -58,20 +57,19 @@ void test_set_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Setting the servant manager should give a wrong policy exception // exception - poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER); + poa->set_servant_manager (PortableServer::ServantManager::_nil()); } - ACE_CATCH (PortableServer::POA::WrongPolicy, ex) + catch (const PortableServer::POA::WrongPolicy& ) { succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -84,7 +82,7 @@ void test_get_servant_with_no_set (PortableServer::POA_ptr poa) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Getting the default servant without one set whould give a NoServant // exception @@ -93,14 +91,13 @@ test_get_servant_with_no_set (PortableServer::POA_ptr poa) ACE_UNUSED_ARG (servant); } - ACE_CATCH (PortableServer::POA::NoServant, ex) + catch (const PortableServer::POA::NoServant& ) { succeed = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -110,24 +107,23 @@ test_get_servant_with_no_set (PortableServer::POA_ptr poa) } void -test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) +test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa) { test_i test; CORBA::ULong expected_refcount = 1; PortableServer::ObjectId* id = - root_poa->activate_object (&test ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&test); expected_refcount++; CORBA::Object_var object = - root_poa->id_to_reference (*id ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (*id); PortableServer::ServantBase_var servant = - root_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER); + root_poa->reference_to_servant (object.in ()); expected_refcount++; - root_poa->deactivate_object (*id ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (*id); expected_refcount--; CORBA::ULong refcount = @@ -142,25 +138,21 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Narrow to POA. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -172,26 +164,22 @@ main (int argc, char **argv) // Request Processing Policy. policies[0] = - root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT); // Id Uniqueness Policy. policies[1] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID); // Servant Retention Policy. policies[2] = - root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN - ACE_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN); // Create POA to host default servant. ACE_CString name = "Default Servant"; PortableServer::POA_var default_servant_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Destroy policies. for (CORBA::ULong i = 0; @@ -205,8 +193,7 @@ main (int argc, char **argv) // Activate POA manager. poa_manager->activate (); - test_reference_to_servant_active_object(root_poa.in () - ACE_ENV_ARG_PARAMETER); + test_reference_to_servant_active_object(root_poa.in ()); // Test servant. test_i test; @@ -219,8 +206,7 @@ main (int argc, char **argv) (void) test_set_servant_manager (default_servant_poa.in()); // Register default servant. - default_servant_poa->set_servant (&test - ACE_ENV_ARG_PARAMETER); + default_servant_poa->set_servant (&test); expected_refcount++; // Create dummy id. @@ -229,13 +215,11 @@ main (int argc, char **argv) // Create dummy object. object = - default_servant_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + default_servant_poa->create_reference ("IDL:test:1.0"); // Invoke id_to_servant(). Should retrieve default servant. PortableServer::ServantBase_var servant = - default_servant_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + default_servant_poa->id_to_servant (id.in ()); expected_refcount++; // Assert correctness. @@ -243,8 +227,7 @@ main (int argc, char **argv) // Invoke reference_to_servant(). Should retrieve default servant. servant = - default_servant_poa->reference_to_servant (object.in () - ACE_ENV_ARG_PARAMETER); + default_servant_poa->reference_to_servant (object.in ()); expected_refcount++; // Assert correctness. @@ -264,12 +247,11 @@ main (int argc, char **argv) // Destroy the ORB. orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 65c22a9f8ed..3bb0a772b76 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -21,5 +21,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp index c2d1c7593ce..2d0cf940897 100644 --- a/TAO/tests/POA/EndpointPolicy/client.cpp +++ b/TAO/tests/POA/EndpointPolicy/client.cpp @@ -44,29 +44,27 @@ main (int argc, char *argv[]) CORBA::ORB_var orb; CORBA::Object_var tmp; - ACE_TRY_NEW_ENV + try { - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; - tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + tmp = orb->string_to_object(ior); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG,"client: Invocation expecting to %s\n", (bad_ior ? "fail" : "work"))); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -89,17 +87,15 @@ main (int argc, char *argv[]) hello->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { if (!bad_ior) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "client: Exception caught:"); + ex._tao_print_exception ("client: Exception caught:"); return 1; } ACE_DEBUG ((LM_DEBUG, "client: success!\n")); } - ACE_ENDTRY; orb->destroy (); diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 835dfbc8b43..fdb86bda753 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -24,7 +24,7 @@ class test_i : public POA_test { public: - void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) + void method ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,8 +54,7 @@ class Servant_Activator : public PortableServer::ServantActivator { public: PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -63,15 +62,13 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL) + CORBA::Boolean remaining_activations) ACE_THROW_SPEC ((CORBA::SystemException)); }; PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &id, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::POA_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -95,8 +92,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, PortableServer::POA_ptr , PortableServer::Servant servant, CORBA::Boolean, - CORBA::Boolean - ACE_ENV_ARG_DECL) + CORBA::Boolean) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_name = @@ -118,25 +114,21 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -147,24 +139,20 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT); // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); poa_manager->activate (); @@ -173,8 +161,7 @@ main (int argc, char **argv) new Servant_Activator; // Set servant_activator as the servant_manager of child POA. - child_poa->set_servant_manager (servant_manager.in () - ACE_ENV_ARG_PARAMETER); + child_poa->set_servant_manager (servant_manager.in ()); { // Create a reference with user created ID in child POA which @@ -184,17 +171,14 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test->method (); - child_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->deactivate_object (id.in ()); } { @@ -205,17 +189,14 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test->method (); - child_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->deactivate_object (id.in ()); } { @@ -226,11 +207,9 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); - child_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->deactivate_object (id.in ()); } { @@ -241,25 +220,22 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); PortableServer::ObjectId_var oid = - child_poa->reference_to_id (object.in () ACE_ENV_ARG_PARAMETER); + child_poa->reference_to_id (object.in ()); - child_poa->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + child_poa->deactivate_object (oid.in ()); } ACE_DEBUG ((LM_DEBUG, "\nEnd of main()\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; 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 b92532c9614..1bdba102e50 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -35,7 +35,7 @@ public: }; PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +test_i::_default_POA ( /**/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -44,28 +44,26 @@ void test_i::deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->poa_->deactivate_object (this->id_ - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (this->id_); // Exception flag int expected_exception_raised = 0; - ACE_TRY + try { - this->poa_->deactivate_object (this->id_ - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (this->id_); } - ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) + catch (const PortableServer::POA::ObjectNotActive& ) { // This is the correct exception! Ignore expected_exception_raised = 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type"); + ex._tao_print_exception ( + "Exception caught of incorrect type"); ACE_ASSERT (0); } - ACE_ENDTRY; // Make sure an exception was raised and it was of the correct type. ACE_ASSERT (expected_exception_raised); @@ -75,8 +73,7 @@ test_i::deactivate_self (void) void test_object_deactivation (PortableServer::POA_ptr poa, - const PortableServer::ObjectId &id - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &id) { test_i servant; int expected_exception_raised = 0; @@ -84,23 +81,21 @@ test_object_deactivation (PortableServer::POA_ptr poa, PortableServer::ObjectId_var invalid_id = PortableServer::string_to_ObjectId ("invalid id"); - ACE_TRY_EX (invalid_id) + try { - poa->deactivate_object (invalid_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (invalid_id); + poa->deactivate_object (invalid_id.in ()); } - ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) + catch (const PortableServer::POA::ObjectNotActive& ) { // This is the correct exception! Ignore expected_exception_raised = 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type"); + ex._tao_print_exception ( + "Exception caught of incorrect type"); ACE_ASSERT (0); } - ACE_ENDTRY; // Make sure an exception was raised and it was of the correct // type. @@ -109,40 +104,35 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - poa->deactivate_object (id - ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (id); // Reset flag expected_exception_raised = 0; - ACE_TRY_EX (double_deactivate) + try { - poa->deactivate_object (id - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (double_deactivate); + poa->deactivate_object (id); } - ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) + catch (const PortableServer::POA::ObjectNotActive& ) { // This is the correct exception! Ignore expected_exception_raised = 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type"); + ex._tao_print_exception ( + "Exception caught of incorrect type"); ACE_ASSERT (0); } - ACE_ENDTRY; // Make sure an exception was raised and it was of the correct // type. ACE_ASSERT (expected_exception_raised); poa->activate_object_with_id (id, - &servant - ACE_ENV_ARG_PARAMETER); + &servant); servant.poa_ = PortableServer::POA::_duplicate (poa); @@ -162,25 +152,21 @@ test_object_deactivation (PortableServer::POA_ptr poa, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -190,35 +176,29 @@ main (int argc, char **argv) PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - empty_policies - ACE_ENV_ARG_PARAMETER); + empty_policies); poa_manager->activate (); obj = - root_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + root_poa->create_reference ("IDL:test:1.0"); PortableServer::ObjectId_var id = - root_poa->reference_to_id (obj.in () - ACE_ENV_ARG_PARAMETER); + root_poa->reference_to_id (obj.in ()); test_object_deactivation (root_poa.in (), - id.in () - ACE_ENV_ARG_PARAMETER); + id.in ()); id = PortableServer::string_to_ObjectId ("good id"); test_object_deactivation (child_poa.in (), - id.in () - ACE_ENV_ARG_PARAMETER); + id.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 28a88c7a4bb..1a2065754ef 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -46,64 +46,53 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POA_out first_poa, PortableServer::POA_out second_poa, PortableServer::POA_out third_poa, - PortableServer::POA_out forth_poa - ACE_ENV_ARG_DECL) + PortableServer::POA_out forth_poa) { // Policies for the new POAs CORBA::PolicyList policies (3); policies.length (3); - policies[0] = root_poa->create_lifespan_policy (lifespan_policy - ACE_ENV_ARG_PARAMETER); + policies[0] = root_poa->create_lifespan_policy (lifespan_policy); - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - ACE_ENV_ARG_PARAMETER); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID); - policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID - ACE_ENV_ARG_PARAMETER); + policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID); // Creation of the firstPOA ACE_CString name = "firstPOA"; first_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policies[1]->destroy (); - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - ACE_ENV_ARG_PARAMETER); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID); // Creation of the secondPOA name = "secondPOA"; second_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policies[2]->destroy (); - policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID); // Creation of the thirdPOA name = "thirdPOA"; third_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policies[1]->destroy (); - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - ACE_ENV_ARG_PARAMETER); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID); // Creation of the forthPOA name = "forthPOA"; forth_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of the new POAs over, so destroy the policies for (CORBA::ULong i = 0; @@ -121,42 +110,33 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::POA_ptr second_poa, PortableServer::POA_ptr third_poa, PortableServer::POA_ptr forth_poa, - int perform_deactivation_test - ACE_ENV_ARG_DECL) + int perform_deactivation_test) { { test_i servant (root_poa); - CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0"); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in ()); root_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - obj = root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + obj = root_poa->id_to_reference (id.in ()); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); 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); + root_poa->reference_to_servant (obj.in ()); PortableServer::ServantBase_var servant_from_id = - root_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_servant (id.in ()); if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -166,105 +146,83 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = root_poa->servant_to_reference (&servant - ACE_ENV_ARG_PARAMETER); + obj = root_poa->servant_to_reference (&servant); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = servant._this (); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant); ACE_ASSERT (id_from_servant.in () == id.in ()); - root_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in ()); if (perform_deactivation_test) { root_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - servant_from_reference = root_poa->reference_to_servant (obj.in () - ACE_ENV_ARG_PARAMETER); + servant_from_reference = root_poa->reference_to_servant (obj.in ()); ACE_ASSERT (servant_from_reference.in () == &servant); - root_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in ()); } } { test_i servant (root_poa); - PortableServer::ObjectId_var id = root_poa->activate_object (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = root_poa->activate_object (&servant); - CORBA::Object_var obj = root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = root_poa->id_to_reference (id.in ()); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); 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); + "IDL:test:1.0"); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - root_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in ()); } { test_i servant (first_poa); - CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0"); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in ()); first_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - obj = first_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + obj = first_poa->id_to_reference (id.in ()); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); 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); + first_poa->reference_to_servant (obj.in ()); PortableServer::ServantBase_var servant_from_id = - first_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + first_poa->id_to_servant (id.in ()); if (servant_from_reference .in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -274,85 +232,67 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - first_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + first_poa->deactivate_object (id.in ()); if (perform_deactivation_test) { first_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - servant_from_reference = first_poa->reference_to_servant (obj.in () - ACE_ENV_ARG_PARAMETER); + servant_from_reference = first_poa->reference_to_servant (obj.in ()); ACE_ASSERT (servant_from_reference.in () == &servant); - first_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + first_poa->deactivate_object (id.in ()); } } { test_i servant (first_poa); - PortableServer::ObjectId_var id = first_poa->activate_object (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = first_poa->activate_object (&servant); - CORBA::Object_var obj = first_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = first_poa->id_to_reference (id.in ()); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); 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); + "IDL:test:1.0"); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - first_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + first_poa->deactivate_object (id.in ()); } { test_i servant (second_poa); - CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0"); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in ()); second_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - obj = second_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + obj = second_poa->id_to_reference (id.in ()); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); 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); + second_poa->reference_to_servant (obj.in ()); PortableServer::ServantBase_var servant_from_id = - second_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + second_poa->id_to_servant (id.in ()); if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -362,70 +302,56 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = second_poa->servant_to_reference (&servant - ACE_ENV_ARG_PARAMETER); + obj = second_poa->servant_to_reference (&servant); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = servant._this (); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant); ACE_ASSERT (id_from_servant.in () == id.in ()); - second_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + second_poa->deactivate_object (id.in ()); if (perform_deactivation_test) { second_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - servant_from_reference = second_poa->reference_to_servant (obj.in () - ACE_ENV_ARG_PARAMETER); + servant_from_reference = second_poa->reference_to_servant (obj.in ()); ACE_ASSERT (servant_from_reference.in () == &servant); - second_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + second_poa->deactivate_object (id.in ()); } } { test_i servant (second_poa); - PortableServer::ObjectId_var id = second_poa->activate_object (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = second_poa->activate_object (&servant); - CORBA::Object_var obj = second_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = second_poa->id_to_reference (id.in ()); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); 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); + "IDL:test:1.0"); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - second_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + second_poa->deactivate_object (id.in ()); } { @@ -433,16 +359,13 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello"); CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); 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); + PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in ()); string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -450,24 +373,19 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_reference.in () == id.in ()); third_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - obj = third_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + obj = third_poa->id_to_reference (id.in ()); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); 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); + third_poa->reference_to_servant (obj.in ()); PortableServer::ServantBase_var servant_from_id = - third_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + third_poa->id_to_servant (id.in ()); if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -477,45 +395,37 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = third_poa->servant_to_reference (&servant - ACE_ENV_ARG_PARAMETER); + obj = third_poa->servant_to_reference (&servant); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = servant._this (); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant); string = PortableServer::ObjectId_to_string (id_from_servant.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); ACE_ASSERT (id_from_servant.in () == id.in ()); - third_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + third_poa->deactivate_object (id.in ()); if (perform_deactivation_test) { third_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - servant_from_reference = third_poa->reference_to_servant (obj.in () - ACE_ENV_ARG_PARAMETER); + servant_from_reference = third_poa->reference_to_servant (obj.in ()); ACE_ASSERT (servant_from_reference.in () == &servant); - third_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + third_poa->deactivate_object (id.in ()); } } @@ -524,16 +434,13 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello"); CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); - CORBA::String_var string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var string = orb->object_to_string (obj.in ()); 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); + PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in ()); string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -541,24 +448,19 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_reference.in () == id.in ()); forth_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - obj = forth_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + obj = forth_poa->id_to_reference (id.in ()); - string = orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + string = orb->object_to_string (obj.in ()); 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); + forth_poa->reference_to_servant (obj.in ()); PortableServer::ServantBase_var servant_from_id = - forth_poa->id_to_servant (id.in () - ACE_ENV_ARG_PARAMETER); + forth_poa->id_to_servant (id.in ()); if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -573,16 +475,13 @@ test_poas (CORBA::ORB_ptr orb, if (perform_deactivation_test) { forth_poa->activate_object_with_id (id.in (), - &servant - ACE_ENV_ARG_PARAMETER); + &servant); - servant_from_reference = forth_poa->reference_to_servant (obj.in () - ACE_ENV_ARG_PARAMETER); + servant_from_reference = forth_poa->reference_to_servant (obj.in ()); ACE_ASSERT (servant_from_reference.in () == &servant); - forth_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + forth_poa->deactivate_object (id.in ()); } } } @@ -590,20 +489,16 @@ test_poas (CORBA::ORB_ptr orb, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()); const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters = TAO_ORB_Core_instance ()->server_factory ()->active_object_map_creation_parameters (); @@ -620,8 +515,7 @@ main (int argc, char **argv) first_poa.out (), second_poa.out (), third_poa.out (), - forth_poa.out () - ACE_ENV_ARG_PARAMETER); + forth_poa.out ()); test_poas (orb.in (), root_poa.in (), @@ -629,32 +523,26 @@ main (int argc, char **argv) second_poa.in (), third_poa.in (), forth_poa.in (), - perform_deactivation_test - ACE_ENV_ARG_PARAMETER); + perform_deactivation_test); first_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); second_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); third_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); forth_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); create_poas (root_poa.in (), PortableServer::PERSISTENT, first_poa.out (), second_poa.out (), third_poa.out (), - forth_poa.out () - ACE_ENV_ARG_PARAMETER); + forth_poa.out ()); test_poas (orb.in (), root_poa.in (), @@ -662,20 +550,16 @@ main (int argc, char **argv) second_poa.in (), third_poa.in (), forth_poa.in (), - perform_deactivation_test - ACE_ENV_ARG_PARAMETER); + perform_deactivation_test); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception!"); + ex._tao_print_exception ("Exception!"); return -1; } - ACE_ENDTRY; 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 885007113bf..0b21b5fbcd3 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -90,8 +90,7 @@ public: ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, - PortableServer::ServantLocator::Cookie & - ACE_ENV_ARG_DECL) + PortableServer::ServantLocator::Cookie &) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -99,8 +98,7 @@ public: PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie, - PortableServer::Servant - ACE_ENV_ARG_DECL) + PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)); test_i servant_; @@ -115,8 +113,7 @@ Servant_Locator::Servant_Locator (PortableServer::POA_ptr poa) Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *, - PortableServer::ServantLocator::Cookie & - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::ServantLocator::Cookie &) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -150,8 +147,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie, - PortableServer::Servant - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name = @@ -181,24 +177,22 @@ bool set_nil_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; - ACE_TRY_NEW_ENV + try { // Setting a nil servant manager should give an OBJ_Adapter exception with // minor code 4 - poa->set_servant_manager (PortableServer::ServantManager::_nil() - ACE_ENV_ARG_PARAMETER); + poa->set_servant_manager (PortableServer::ServantManager::_nil()); } - ACE_CATCH (CORBA::OBJ_ADAPTER, ex) + catch (const CORBA::OBJ_ADAPTER& ex) { if ((ex.minor() & 0xFFFU) == 4) { succeed = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -213,26 +207,24 @@ bool overwrite_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; - ACE_TRY_NEW_ENV + try { Servant_Locator servant_locator (poa); // Setting a servant manager after it is already set should give // obj_adapter with minor code 6 - poa->set_servant_manager (&servant_locator - ACE_ENV_ARG_PARAMETER); + poa->set_servant_manager (&servant_locator); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ex) { if ((ex.minor() & 0xFFFU) == 6) { succeed = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!succeed) { @@ -248,21 +240,18 @@ main (int argc, char **argv) { int retval = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -274,31 +263,26 @@ main (int argc, char **argv) policies.length (current_length + 1); policies[current_length++] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); policies.length (current_length + 1); policies[current_length++] = - root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN - ACE_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN); policies.length (current_length + 1); policies[current_length++] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); if (!set_nil_servant_manager (child_poa.in())) retval = -1; Servant_Locator servant_locator (child_poa.in ()); - child_poa->set_servant_manager (&servant_locator - ACE_ENV_ARG_PARAMETER); + child_poa->set_servant_manager (&servant_locator); if (!overwrite_servant_manager (child_poa.in())) retval = -1; @@ -308,24 +292,20 @@ main (int argc, char **argv) CORBA::Object_var first_object = child_poa->create_reference_with_id (first_oid.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var first_test = - test::_narrow (first_object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (first_object.in ()); PortableServer::ObjectId_var second_oid = PortableServer::string_to_ObjectId ("second"); CORBA::Object_var second_object = child_poa->create_reference_with_id (second_oid.in (), - "IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + "IDL:test:1.0"); test_var second_test = - test::_narrow (second_object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (second_object.in ()); first_task.object (first_test.in ()); second_task.object (second_test.in ()); @@ -337,19 +317,17 @@ main (int argc, char **argv) second_task.wait (); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); ACE_DEBUG ((LM_DEBUG, "%s successful\n", argv[0])); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); retval = -1; } - ACE_ENDTRY; return retval; } 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 ea08b02a671..4e484a4119f 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 @@ -85,7 +85,7 @@ Object_Activator::Object_Activator (ACE_Thread_Manager &thread_manager, int Object_Activator::svc (void) { - ACE_TRY_NEW_ENV + try { test_i *servant = new test_i (this->poa_.in ()); @@ -93,20 +93,18 @@ Object_Activator::svc (void) PortableServer::ServantBase_var safe_servant (servant); PortableServer::ObjectId_var id = - this->poa_->activate_object (servant - ACE_ENV_ARG_PARAMETER); + this->poa_->activate_object (servant); this->object_activated_.signal (); - this->poa_->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (id.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in activator thread"); + ex._tao_print_exception ( + "Exception caught in activator thread"); return -1; } - ACE_ENDTRY; return 0; } @@ -121,8 +119,7 @@ public: Servant_Activator (PortableServer::POA_ptr poa); PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -130,8 +127,7 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL) + CORBA::Boolean remaining_activations) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -147,8 +143,7 @@ Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa) PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -158,11 +153,9 @@ Servant_Activator::incarnate (const PortableServer::ObjectId &, PortableServer::ServantBase_var safe_servant (servant); this->id_ = - this->poa_->activate_object (servant - ACE_ENV_ARG_PARAMETER); + this->poa_->activate_object (servant); - this->poa_->deactivate_object (this->id_.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (this->id_.in ()); int result = global_object_activator->activate (); @@ -204,8 +197,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, PortableServer::POA_ptr, PortableServer::Servant servant, CORBA::Boolean, - CORBA::Boolean - ACE_ENV_ARG_DECL) + CORBA::Boolean) ACE_THROW_SPEC ((CORBA::SystemException)) { servant->_remove_ref (); @@ -214,21 +206,18 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -240,30 +229,24 @@ main (int argc, char **argv) policies.length (current_length + 1); policies[current_length++] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); Servant_Activator servant_activator (child_poa.in ()); - child_poa->set_servant_manager (&servant_activator - ACE_ENV_ARG_PARAMETER); + child_poa->set_servant_manager (&servant_activator); CORBA::Object_var first_object = - child_poa->create_reference ("IDL:test:1.0" - ACE_ENV_ARG_PARAMETER); + child_poa->create_reference ("IDL:test:1.0"); test_var first_test = - test::_narrow (first_object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (first_object.in ()); PortableServer::ObjectId_var id = - child_poa->reference_to_id (first_object.in () - ACE_ENV_ARG_PARAMETER); + child_poa->reference_to_id (first_object.in ()); ACE_Thread_Manager thread_manager; @@ -275,22 +258,19 @@ main (int argc, char **argv) first_test->method (); - child_poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->deactivate_object (id.in ()); // Wait for the Object_Activator thread to exit. thread_manager.wait (); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } 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 86d60cf1a65..ecac2227ab3 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -49,47 +49,40 @@ test_i::~test_i (void) if (this->other_) { - ACE_TRY_NEW_ENV + try { PortableServer::POA_var poa = this->_default_POA (); - PortableServer::ObjectId_var id = poa->servant_to_id (this->other_ - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = poa->servant_to_id (this->other_); ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n")); - poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_i::~test_i"); + ex._tao_print_exception ("test_i::~test_i"); } - ACE_ENDTRY; } } int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -101,32 +94,27 @@ main (int argc, char **argv) test_i *servant2 = new test_i (servant1); PortableServer::ObjectId_var id1 = - root_poa->activate_object (servant1 - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (servant1); // Give ownership to POA. servant1->_remove_ref (); PortableServer::ObjectId_var id2 = - root_poa->activate_object (servant2 - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (servant2); // Give ownership to POA. servant2->_remove_ref (); - root_poa->deactivate_object (id2.in () - ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id2.in ()); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 60682e114db..98a931f25e0 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -74,14 +74,12 @@ test_i::deactivate_self (void) { PortableServer::POA_var poa = this->_default_POA (); - PortableServer::ObjectId_var id = poa->servant_to_id (this - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var id = poa->servant_to_id (this); if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n")); - poa->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in ()); if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n")); @@ -144,31 +142,27 @@ Activator::svc (void) if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete, trying to activate\n")); - ACE_TRY_NEW_ENV + try { if (this->task_id_ == "first thread") { PortableServer::ObjectId_var id = - this->poa_->activate_object (this->servant_ - ACE_ENV_ARG_PARAMETER); + this->poa_->activate_object (this->servant_); } else { this->poa_->activate_object_with_id (this->id_, - this->servant_ - ACE_ENV_ARG_PARAMETER); + this->servant_); } if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Activation complete\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Activator::svc"); + ex._tao_print_exception ("Activator::svc"); return -1; } - ACE_ENDTRY; return 0; } @@ -190,32 +184,28 @@ Deactivator::Deactivator (test_ptr t) int Deactivator::svc (void) { - ACE_TRY_NEW_ENV + try { this->test_->deactivate_self (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Deactivator::svc"); + ex._tao_print_exception ("Deactivator::svc"); return -1; } - ACE_ENDTRY; return 0; } int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int parse_args_result = parse_args (argc, argv); @@ -225,13 +215,11 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -285,15 +273,13 @@ main (int argc, char **argv) return result; root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index b1969e4d810..be4f89f1607 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -70,29 +70,25 @@ parse_args (int argc, char *argv[]) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "POAManagerFactoryTest" - ACE_ENV_ARG_PARAMETER); + "POAManagerFactoryTest"); if (parse_args (argc, argv) != 0) return 1; // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Narrow to POA. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (verbose) ACE_DEBUG ((LM_DEBUG, @@ -121,8 +117,7 @@ main (int argc, char **argv) // Explicitly create a POAManager - "POAManager1" . PortableServer::POAManager_var poa_manager_1 = poa_manager_factory->create_POAManager ("POAManager1", - policies - ACE_ENV_ARG_PARAMETER); + policies); VERIFY_CONDITION (!CORBA::is_nil(poa_manager_1.in())); if (verbose) @@ -137,19 +132,16 @@ main (int argc, char **argv) ACE_TEXT("Prevent duplicated POAManagers: "))); pretest = fail; CORBA::Boolean got_expected_exception = false; - ACE_TRY_EX (create) + try { PortableServer::POAManager_var poa_manager = poa_manager_factory->create_POAManager ("POAManager1", - policies - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (create); + policies); } - ACE_CATCH (PortableServer::POAManagerFactory::ManagerAlreadyExists, mae) + catch (const PortableServer::POAManagerFactory::ManagerAlreadyExists& ) { got_expected_exception = true; } - ACE_ENDTRY; VERIFY_CONDITION (got_expected_exception); if (verbose) @@ -169,8 +161,7 @@ main (int argc, char **argv) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA2", PortableServer::POAManager::_nil (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::POAManager_var poa_manager_2 = child_poa->the_POAManager (); @@ -246,7 +237,7 @@ main (int argc, char **argv) pretest = fail; PortableServer::POAManager_var manager - = poa_manager_factory->find ("POAManager1" ACE_ENV_ARG_PARAMETER); + = poa_manager_factory->find ("POAManager1"); CORBA::String_var name = manager->get_id (); @@ -267,8 +258,7 @@ main (int argc, char **argv) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager_1.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); poa_manager_1->activate (); @@ -277,14 +267,13 @@ main (int argc, char **argv) if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n"))); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { fail++; if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("failed\n"))); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); } - ACE_ENDTRY; 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 831234c8537..899d8fae6ee 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -35,32 +35,27 @@ test_i::destroy_poa (void) CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 0; poa->destroy (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); + wait_for_completion); } int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -74,12 +69,11 @@ main (int argc, char **argv) test_object->destroy_poa (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index 0813be7b6b5..4b22ec2ca25 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -61,15 +61,13 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int parse_args_result = parse_args (argc, argv); @@ -77,12 +75,10 @@ main (int argc, char **argv) return parse_args_result; CORBA::Object_var object = - orb->string_to_object (IOR - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (IOR); test_var test1 = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test1->method (); @@ -105,12 +101,11 @@ main (int argc, char **argv) test1->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!"); + ex._tao_print_exception ("Error!"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 6ee388c43f1..4a947ab13cc 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -64,12 +64,10 @@ test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - this->orb_->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = - PortableServer::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (obj.in ()); PortableServer::POA_var poa = current->get_POA (); @@ -86,8 +84,7 @@ void test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr @@ -104,12 +101,10 @@ test_i::create_POA (void) policies.length (2); policies[0] = - this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID - ACE_ENV_ARG_PARAMETER); + this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID); policies[1] = - this->poa_->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + this->poa_->create_lifespan_policy (PortableServer::PERSISTENT); PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (); @@ -118,8 +113,7 @@ test_i::create_POA (void) this->child_poa_ = this->poa_->create_POA (name.c_str (), poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Destroy the policies for (CORBA::ULong i = 0; @@ -138,14 +132,12 @@ test_i::create_POA (void) if (this->oid_.ptr () == 0) { this->oid_ = - this->child_poa_->activate_object (servant - ACE_ENV_ARG_PARAMETER); + this->child_poa_->activate_object (servant); } else { this->child_poa_->activate_object_with_id (this->oid_.in (), - servant - ACE_ENV_ARG_PARAMETER); + servant); } test_var test = @@ -158,8 +150,7 @@ void test_i::destroy_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->child_poa_->destroy (1, 0 - ACE_ENV_ARG_PARAMETER); + this->child_poa_->destroy (1, 0); } const char *ior_file = "ior"; @@ -221,27 +212,23 @@ write_ior_to_file (const char *ior) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); if (result != 0) return result; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -253,7 +240,7 @@ main (int argc, char **argv) servant._this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); int write_result = write_ior_to_file (ior.in ()); @@ -264,12 +251,11 @@ main (int argc, char **argv) orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index a1f067968ca..1aa17eabfcd 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -28,26 +28,22 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Narrow to POA. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the POA. PortableServer::POAManager_var poa_manager = @@ -59,20 +55,17 @@ main (int argc, char **argv) { PortableServer::ThreadPolicy_var policy1 = - root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL - ACE_ENV_ARG_PARAMETER); + root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL); CORBA::Any policy_value; policy_value <<= PortableServer::ORB_CTRL_MODEL; CORBA::Policy_var policy = orb->create_policy (PortableServer::THREAD_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::ThreadPolicy_var policy2 = - PortableServer::ThreadPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ThreadPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -81,60 +74,51 @@ main (int argc, char **argv) { PortableServer::LifespanPolicy_var policy1 = - root_poa->create_lifespan_policy (PortableServer::TRANSIENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::TRANSIENT); CORBA::Any policy_value; policy_value <<= PortableServer::TRANSIENT; CORBA::Policy_var policy = orb->create_policy (PortableServer::LIFESPAN_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::LifespanPolicy_var policy2 = - PortableServer::LifespanPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::LifespanPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } { PortableServer::IdUniquenessPolicy_var policy1 = - root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID); CORBA::Any policy_value; policy_value <<= PortableServer::UNIQUE_ID; CORBA::Policy_var policy = orb->create_policy (PortableServer::ID_UNIQUENESS_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::IdUniquenessPolicy_var policy2 = - PortableServer::IdUniquenessPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::IdUniquenessPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } { PortableServer::IdAssignmentPolicy_var policy1 = - root_poa->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID); CORBA::Any policy_value; policy_value <<= PortableServer::USER_ID; CORBA::Policy_var policy = orb->create_policy (PortableServer::ID_ASSIGNMENT_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::IdAssignmentPolicy_var policy2 = - PortableServer::IdAssignmentPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::IdAssignmentPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -143,60 +127,51 @@ main (int argc, char **argv) { PortableServer::ImplicitActivationPolicy_var policy1 = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); CORBA::Any policy_value; policy_value <<= PortableServer::IMPLICIT_ACTIVATION; CORBA::Policy_var policy = orb->create_policy (PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::ImplicitActivationPolicy_var policy2 = - PortableServer::ImplicitActivationPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } { PortableServer::ServantRetentionPolicy_var policy1 = - root_poa->create_servant_retention_policy (PortableServer::RETAIN - ACE_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN); CORBA::Any policy_value; policy_value <<= PortableServer::RETAIN; CORBA::Policy_var policy = orb->create_policy (PortableServer::SERVANT_RETENTION_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::ServantRetentionPolicy_var policy2 = - PortableServer::ServantRetentionPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ServantRetentionPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } { PortableServer::RequestProcessingPolicy_var policy1 = - root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY - ACE_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY); CORBA::Any policy_value; policy_value <<= PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY; CORBA::Policy_var policy = orb->create_policy (PortableServer::REQUEST_PROCESSING_POLICY_ID, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); PortableServer::RequestProcessingPolicy_var policy2 = - PortableServer::RequestProcessingPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::RequestProcessingPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -208,12 +183,11 @@ main (int argc, char **argv) argv[0])); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index 37f8c315906..6f4b1e859ce 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -21,7 +21,6 @@ public: } virtual void moo ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -31,7 +30,7 @@ public: }; CORBA::ULong -getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL) +getRefCount (PortableServer::ServantBase * sb) { return sb->_refcount_value (); } @@ -39,16 +38,16 @@ getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL) int main (int argc, char * argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -62,7 +61,7 @@ main (int argc, char * argv[]) ACE_DEBUG ((LM_DEBUG, "Before activation: %d\n", before_act)); - PortableServer::ObjectId_var oid = poa->activate_object (h ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid = poa->activate_object (h); CORBA::ULong after_act = h->_refcount_value (); @@ -83,7 +82,7 @@ main (int argc, char * argv[]) 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); + PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in()); CORBA::ULong refCountAfterIdToServant = srv->_refcount_value ();; @@ -105,7 +104,7 @@ main (int argc, char * argv[]) ACE_DEBUG ((LM_DEBUG, "Before deactivate_object: %d\n", before_deact)); - poa->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in()); /* * Because id_to_servant did not increment the reference count, but @@ -121,18 +120,15 @@ main (int argc, char * argv[]) h->_remove_ref (); - orb->shutdown (1 - ACE_ENV_ARG_PARAMETER); + orb->shutdown (1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } 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 c1478b9964a..7626b224f3c 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -93,16 +93,15 @@ Worker::Worker (test_ptr t) int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { this->test_->method (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in thread"); + ex._tao_print_exception ("Exception caught in thread"); return -1; } - ACE_ENDTRY; return 0; } @@ -110,22 +109,19 @@ Worker::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. - CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -136,19 +132,16 @@ main (int argc, char **argv) policies.length (2); policies[0] = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies[1] = - root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL - ACE_ENV_ARG_PARAMETER); + root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL); // Creation of the child POA. PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Destroy the policies for (CORBA::ULong i = 0; @@ -182,15 +175,13 @@ main (int argc, char **argv) ACE_UNUSED_ARG (result); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } 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 cc0249af4b4..b640b83b7c6 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -42,31 +42,26 @@ test_i::destroy_poa (void) CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 1; this->poa_->destroy (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); + wait_for_completion); } PortableServer::POA_ptr init_orb (int argc, char **argv, - const char *orb_name - ACE_ENV_ARG_DECL) + const char *orb_name) { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - orb_name - ACE_ENV_ARG_PARAMETER); + orb_name); // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = @@ -81,45 +76,41 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableServer::POA_var first_poa = init_orb (argc, argv, - "first ORB" - ACE_ENV_ARG_PARAMETER); + "first ORB"); PortableServer::POA_var second_poa = init_orb (argc, argv, - "second ORB" - ACE_ENV_ARG_PARAMETER); + "second ORB"); test_i servant; test_var test_object = servant._this (); int expected_exception_raised = 0; - ACE_TRY_EX (first_poa) + try { servant.test_poa (first_poa.in ()); test_object->destroy_poa (); - ACE_TRY_CHECK_EX (first_poa); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ) { // This is the correct exception! Ignore expected_exception_raised = 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type"); + ex._tao_print_exception ( + "Exception caught of incorrect type"); return -1; } - ACE_ENDTRY; // Make sure an exception was raised and it was of the correct // type. @@ -132,14 +123,13 @@ main (int argc, test_object->destroy_poa (); - first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + first_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception caught"); + ex._tao_print_exception ("Unexpected exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp index 00b5e3bea3c..b446a7fbe94 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp @@ -19,5 +19,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp index b4855e16b19..f9d6b9e3c81 100644 --- a/TAO/tests/Parallel_Connect_Strategy/client.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp @@ -41,16 +41,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); ACE_High_Res_Timer hrt; ACE_hrtime_t elapsed; @@ -59,7 +59,7 @@ main (int argc, char *argv[]) hrt.start(); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in ()); hrt.stop(); hrt.elapsed_microseconds (elapsed); hrt.reset(); @@ -102,13 +102,11 @@ main (int argc, char *argv[]) } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp index 9a63c03d52d..bd186cfbd33 100644 --- a/TAO/tests/Parallel_Connect_Strategy/server.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp @@ -40,16 +40,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -73,7 +73,7 @@ main (int argc, char *argv[]) CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,11 +86,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { @@ -98,7 +97,7 @@ main (int argc, char *argv[]) } else { - adapter->bind ("pcs_test", ior.in() ACE_ENV_ARG_PARAMETER); + adapter->bind ("pcs_test", ior.in()); } poa_manager->activate (); @@ -107,17 +106,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 3ec22426a14..76c0b538fe6 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -50,7 +50,7 @@ Test_Any::opname (void) const } void -Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) +Test_Any::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("o1") <<= this->in_; req->add_inout_arg ("o2") <<= this->inout_; @@ -65,12 +65,12 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); } @@ -91,10 +91,9 @@ static const CORBA::TypeCode_ptr any_table [] = #endif /* any_table isn't currently used */ int -Test_Any::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Any::init_parameters (Param_Test_ptr objref) { - ACE_TRY + try { // get access to a Coffee Object this->cobj_ = objref->make_coffee (); @@ -102,11 +101,10 @@ Test_Any::init_parameters (Param_Test_ptr objref this->reset_parameters (); return 0; } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception doing make_coffee"); + sysex._tao_print_exception ("System Exception doing make_coffee"); } - ACE_ENDTRY; return -1; } @@ -267,21 +265,18 @@ Test_Any::reset_parameters (void) } int -Test_Any::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Any::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_any (this->in_, this->inout_, - this->out_.out () - ACE_ENV_ARG_PARAMETER); + this->out_.out ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index f27f8be3c99..45358671fc4 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -47,15 +47,13 @@ public: ANY_LAST_TEST_ITEM }; - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -70,7 +68,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 80c2e892030..06176f9e302 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -35,12 +35,11 @@ main (int argc, char *argv[]) { int n = 1024; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); ACE_Get_Opt get_opt (argc, argv, "dn:"); int opt; @@ -95,8 +94,7 @@ main (int argc, char *argv[]) { CORBA::Object_var obj = - orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar" - ACE_ENV_ARG_PARAMETER); + orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"); Param_Test_var param_test = TAO::Narrow_Utils<Param_Test>::unchecked_narrow ( @@ -116,7 +114,7 @@ main (int argc, char *argv[]) "Cannot extract Param_Test (oh the horror)\n")); } CORBA::Boolean equiv = - param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER); + param_test->_is_equivalent (o); if (!equiv) { @@ -341,13 +339,11 @@ main (int argc, char *argv[]) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "IDL Types"); + ex._tao_print_exception ("IDL Types"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index e2c78db7621..18f09817c80 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -52,8 +52,7 @@ Test_Bounded_Array_Sequence::opname (void) const } void -Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -67,19 +66,18 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_ArraySeq (*tmp); } int -Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,28 +122,24 @@ Test_Bounded_Array_Sequence::reset_parameters (void) } int -Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_ArraySeq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_array_sequence (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_Array_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_Array_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h index 060454b6e71..5c0c29c5e0f 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_Array_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,8 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index ab5e6b1675c..c4ab4067cae 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -49,8 +49,7 @@ Test_Bounded_Long_Sequence::opname (void) const } void -Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -64,19 +63,18 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Long_Seq (*tmp); } int -Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr) { // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -113,26 +111,22 @@ Test_Bounded_Long_Sequence::reset_parameters (void) } int -Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_Long_Seq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_long_sequence (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_Long_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_Long_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index 52e9fbdeb02..caaae1236e3 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_Long_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 0a286d8d2db..60363f53431 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -49,8 +49,7 @@ Test_Bounded_Short_Sequence::opname (void) const } void -Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -64,19 +63,19 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Short_Seq (*tmp); } int Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED /*env*/) + /*env*/) { // ACE_UNUSED_ARG (objref); @@ -117,27 +116,23 @@ Test_Bounded_Short_Sequence::reset_parameters (void) } int -Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_Short_Seq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_short_sequence (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_Short_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_Short_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index 78f402b4f63..9794e21de32 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_Short_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index b41de5b6c4f..968ebaaa976 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -49,8 +49,7 @@ Test_Bounded_String_Sequence::opname (void) const } void -Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StrSeq (*tmp); } int -Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr) { const char *choiceList[] = { @@ -110,27 +108,23 @@ Test_Bounded_String_Sequence::reset_parameters (void) } int -Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_StrSeq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_strseq (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_String_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_String_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index 31936d01fec..2abe9954fb6 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_String_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index 5eacc3e879f..36a6aba5130 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -57,8 +57,7 @@ Test_Bounded_String::opname (void) const } void -Test_Bounded_String::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_String::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128); @@ -76,19 +75,18 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *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); + req->arguments ()->item (2); *arg3->value () >>= CORBA::Any::to_string (tmp, 128); this->out_ = CORBA::string_dup (tmp); } int -Test_Bounded_String::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_String::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -123,27 +121,23 @@ Test_Bounded_String::reset_parameters (void) } int -Test_Bounded_String::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_String::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::String_out str_out (this->out_); this->ret_ = objref->test_bounded_string (this->in_, this->inout_, - str_out - ACE_ENV_ARG_PARAMETER); + str_out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_String::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_String::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index f8024a686ff..8019f18aecb 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -33,15 +33,13 @@ public: ~Test_Bounded_String (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 40dc7e39d00..2c1318e45d0 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -52,8 +52,7 @@ Test_Bounded_Struct_Sequence::opname (void) const } void -Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -67,19 +66,19 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StructSeq (*tmp); } int Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */ - ACE_ENV_ARG_DECL_NOT_USED /* env */) + /* env */) { Generator *gen = GENERATOR::instance (); // value generator @@ -115,27 +114,23 @@ Test_Bounded_Struct_Sequence::reset_parameters (void) } int -Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_StructSeq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_struct_sequence (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_Struct_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_Struct_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index e59ef86b43e..dc640977d8f 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 1dccf92056f..12b9a01ff52 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -50,8 +50,7 @@ Test_Bounded_WString_Sequence::opname (void) const } void -Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,19 +65,18 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_WStrSeq (*tmp); } int -Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -110,27 +108,23 @@ Test_Bounded_WString_Sequence::reset_parameters (void) } int -Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Bounded_WStrSeq_out out (this->out_.out ()); this->ret_ = objref->test_bounded_wstrseq (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_WString_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_WString_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h index b1057f513f6..0f0c6b9f7e6 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -34,15 +34,13 @@ public: ~Test_Bounded_WString_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,8 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index fea2cc669c6..4ce873cce40 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -58,8 +58,7 @@ Test_Bounded_WString::opname (void) const } void -Test_Bounded_WString::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Bounded_WString::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128); @@ -77,19 +76,18 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *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); + req->arguments ()->item (2); *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128); this->out_ = CORBA::wstring_dup (tmp); } int -Test_Bounded_WString::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Bounded_WString::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,27 +122,23 @@ Test_Bounded_WString::reset_parameters (void) } int -Test_Bounded_WString::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Bounded_WString::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::WString_out str_out (this->out_); this->ret_ = objref->test_bounded_wstring (this->in_, this->inout_, - str_out - ACE_ENV_ARG_PARAMETER); + str_out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Bounded_WString::run_sii_test\n"); + ex._tao_print_exception ("Test_Bounded_WString::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h index ec0fb098b2e..4e7719f272a 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -33,15 +33,13 @@ public: ~Test_Bounded_WString (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,8 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index 358628f74a8..42e21a19170 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -47,8 +47,7 @@ Test_Big_Union::opname (void) const } void -Test_Big_Union::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Big_Union::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -63,21 +62,20 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Big_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Big_Union (*tmp); } int -Test_Big_Union::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Big_Union::init_parameters (Param_Test_ptr objref) { - ACE_TRY + try { // get access to a Coffee Object this->cobj_ = objref->make_coffee (); @@ -85,15 +83,15 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref this->reset_parameters (); return 0; } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee"); + sysex._tao_print_exception ("System Exception doing make_coffee"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee"); + ex._tao_print_exception ( + "An exception caught in make_coffee"); } - ACE_ENDTRY; return -1; } @@ -226,25 +224,21 @@ Test_Big_Union::reset_parameters (void) } int -Test_Big_Union::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Big_Union::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_big_union (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Big_Union::run_sii_test\n"); + ex._tao_print_exception ("Test_Big_Union::run_sii_test\n"); } - ACE_ENDTRY; return -1; } @@ -283,8 +277,7 @@ Test_Big_Union::check_validity (void) break; case 1: { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Coffee_ptr in = this->in_.the_interface (); Coffee_ptr inout = this->inout_.the_interface (); @@ -314,11 +307,10 @@ Test_Big_Union::check_validity (void) ret_desc->name.in ())) return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return 0; } - ACE_ENDTRY; } break; case 2: diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h index f08e0eac9c3..fc304337279 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -37,15 +37,13 @@ public: BIG_UNION_N_BRANCHES = 12 }; - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -60,7 +58,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 281b11ae2e0..87324854779 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -65,10 +65,8 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.iterations (opt->loop_count ()); // Declare the Env - ACE_DECLARE_NEW_CORBA_ENV; // Initialize parameters for the test. - int check = this->test_object_->init_parameters (this->param_test_ - ACE_ENV_ARG_PARAMETER); + int check = this->test_object_->init_parameters (this->param_test_); if (check == -1) { @@ -83,7 +81,7 @@ Param_Test_Client<T>::run_sii_test (void) // Make the calls in a loop. for (i = 0; i < opt->loop_count (); i++) { - ACE_TRY + try { this->results_.call_count (this->results_.call_count () + 1); if (opt->debug ()) @@ -96,8 +94,7 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.start_timer (); // make the call - this->test_object_->run_sii_test (this->param_test_ - ACE_ENV_ARG_PARAMETER); + this->test_object_->run_sii_test (this->param_test_); // stop the timer. this->results_.stop_timer (); @@ -109,11 +106,11 @@ Param_Test_Client<T>::run_sii_test (void) this->test_object_->print_values (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->results_.error_count (this->results_.error_count () + 1); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, opname); + ex._tao_print_exception (opname); ACE_ERROR ((LM_ERROR, "(%N:%l) client.cpp - run_sii_test:" "run_sii_test exception in iteration %d", @@ -121,7 +118,6 @@ Param_Test_Client<T>::run_sii_test (void) goto loop_around; } - ACE_ENDTRY; if (!this->test_object_->check_validity ()) { @@ -176,10 +172,8 @@ Param_Test_Client<T>::run_dii_test (void) this->results_.iterations (opt->loop_count ()); // Environment variable - ACE_DECLARE_NEW_CORBA_ENV; // initialize parameters for the test - int check = this->test_object_->init_parameters (this->param_test_ - ACE_ENV_ARG_PARAMETER); + int check = this->test_object_->init_parameters (this->param_test_); if (check == -1) { @@ -202,10 +196,9 @@ Param_Test_Client<T>::run_dii_test (void) // create the request CORBA::Request_var req; - ACE_TRY + try { - req = this->param_test_->_request (opname - ACE_ENV_ARG_PARAMETER); + req = this->param_test_->_request (opname); if (opt->debug ()) { @@ -214,18 +207,15 @@ 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); + this->test_object_->dii_req_invoke (req.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->results_.error_count (this->results_.error_count () + 1); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - opname); + ex._tao_print_exception (opname); goto loop_around; } - ACE_ENDTRY; if (opt->debug ()) { diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 4632ba15471..fead61f2821 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -53,8 +53,7 @@ Test_Complex_Any::opname (void) const } void -Test_Complex_Any::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Complex_Any::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -69,19 +68,18 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); } int -Test_Complex_Any::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Complex_Any::init_parameters (Param_Test_ptr) { return this->reset_parameters (); } @@ -166,21 +164,18 @@ Test_Complex_Any::reset_parameters (void) } int -Test_Complex_Any::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Complex_Any::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_complex_any (this->in_, this->inout_, - this->out_.out () - ACE_ENV_ARG_PARAMETER); + this->out_.out ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index 58763ad6761..7eb861c2223 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -33,15 +33,13 @@ public: ~Test_Complex_Any (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 728caf2c685..174a68185c1 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -63,22 +63,20 @@ int Driver::init (int argc, char **argv) { // environment to track exceptions - ACE_DECLARE_NEW_CORBA_ENV; // retrieve the instance of Options Options *opt = OPTIONS::instance (); char exception_string[256]; - ACE_TRY + try { ACE_OS::strcpy (exception_string, "ORB Initialization"); // Retrieve the underlying ORB this->orb_ = CORBA::ORB_init (argc, argv, - "internet" - ACE_ENV_ARG_PARAMETER); + "internet"); // Parse command line and verify parameters. if (opt->parse_args (argc, argv) == -1) @@ -90,7 +88,7 @@ Driver::init (int argc, char **argv) ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed."); CORBA::Object_var temp = - this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (opt->param_test_ior ()); if (CORBA::is_nil (temp.in())) @@ -102,15 +100,14 @@ Driver::init (int argc, char **argv) // Get the object reference ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed."); - this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); + this->objref_ = Param_Test::_narrow (temp.in()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, exception_string); + ex._tao_print_exception (exception_string); return -1; } - ACE_ENDTRY; return 0; } @@ -611,19 +608,17 @@ Driver::run (void) } // Get in a new environment variable - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (opt->shutdown ()) { this->objref_->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "during shutdown"); + ex._tao_print_exception ("during shutdown"); } - ACE_ENDTRY; return retstatus; } diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 1f9ac960769..b7ab7c154ce 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -49,10 +49,9 @@ Test_Exception::opname (void) const } void -Test_Exception::dii_req_invoke (CORBA::Request_ptr req - ACE_ENV_ARG_DECL) +Test_Exception::dii_req_invoke (CORBA::Request_ptr req) { - ACE_TRY + try { this->in_++; req->add_in_arg ("s1") <<= this->in_; @@ -70,16 +69,16 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= this->out_; } - ACE_CATCH (CORBA::UnknownUserException, user_ex) + catch (CORBA::UnknownUserException& user_ex) { Param_Test::Ooops* oops; Param_Test::BadBoy* bad_boy; @@ -108,9 +107,9 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req } else if (user_ex.exception () >>= bad_boy) { - ACE_PRINT_EXCEPTION ((*bad_boy), - "Test_Exception::dii_req_invoke - " - "unexpected (but known) user exception\n"); + (*bad_boy)._tao_print_exception ( + "Test_Exception::dii_req_invoke - " + "unexpected (but known) user exception\n"); // Since 'BadBoy' is not in the exception list the DII request, // it should not be caught explicitly. See comment below. @@ -129,7 +128,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req } // Catch the SystemException type CORBA::NO_MEMORY thrown by the // server to test the system exception. - ACE_CATCH (CORBA::NO_MEMORY, ex) + catch (const CORBA::NO_MEMORY& ex) { // 'NO_MEMORY' system exception should be caught here. This // happens when the IN arg == 2. @@ -181,7 +180,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req } } } - ACE_CATCH (CORBA::UNKNOWN, ex) + catch (const CORBA::UNKNOWN& ex) { // 'BadBoy' should be caught here. This happens when the IN arg == 3. // Otherwise we don't set the other arg values so the validity @@ -232,12 +231,10 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req } } } - ACE_ENDTRY; } int -Test_Exception::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Exception::init_parameters (Param_Test_ptr) { this->in_ = 0; this->inout_ = 0; @@ -254,18 +251,16 @@ Test_Exception::reset_parameters (void) } int -Test_Exception::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Exception::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->in_++; this->ret_ = objref->test_exception (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); } - ACE_CATCH (Param_Test::Ooops, ex) + catch (const Param_Test::Ooops& ex) { const char *reason = ex.reason.in (); @@ -300,7 +295,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->ret_ = this->in_ * 4; return 0; } - ACE_CATCH (CORBA::NO_MEMORY, ex) + catch (const CORBA::NO_MEMORY& ex) { // 'SystemException' should be caught here, 'CORBA::NO_MEMORY' // system exception is thrown by the servant when the @@ -329,9 +324,8 @@ Test_Exception::run_sii_test (Param_Test_ptr objref if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "Test_Exception::run_sii_test - " - "expected system exception\n"); + ex._tao_print_exception ( + "Test_Exception::run_sii_test - ""expected system exception\n"); } // These weren't passed back because of the exception. We @@ -342,7 +336,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->ret_ = this->in_ * 4; return 0; } - ACE_CATCH (CORBA::UNKNOWN, ex) + catch (const CORBA::UNKNOWN& ex) { // 'BadBoy' should be caught here, since generated code for // Param_Test::test_exception() knows nothing about it. @@ -372,9 +366,8 @@ Test_Exception::run_sii_test (Param_Test_ptr objref if (TAO_debug_level > 0) { - ACE_PRINT_EXCEPTION (ex, - "Test_Exception::run_sii_test - " - "expected unknown exception\n"); + ex._tao_print_exception ( + "Test_Exception::run_sii_test - ""expected unknown exception\n"); } // These weren't passed back because of the exception. We @@ -385,16 +378,14 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->ret_ = this->in_ * 4; return 0; } - ACE_CATCH (Param_Test::BadBoy, ex) + catch (const Param_Test::BadBoy& ex) { // We shouldn't end up here. See comment above. - ACE_PRINT_EXCEPTION (ex, - "Test_Exception::run_sii_test - " - "unexpected user exception\n"); + ex._tao_print_exception ( + "Test_Exception::run_sii_test - ""unexpected user exception\n"); return -1; } - ACE_ENDTRY; // Normal reply - no exception thrown. return 0; diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index acc0f1c2cb0..b8bf8c3e9e4 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -30,15 +30,13 @@ public: ~Test_Exception (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -53,7 +51,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index 09433669ad5..c976b0b690b 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -46,8 +46,7 @@ Test_Fixed_Array::opname (void) const } void -Test_Fixed_Array::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Fixed_Array::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_); @@ -61,12 +60,12 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req Param_Test::Fixed_Array_copy (this->ret_, forany.in ()); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= forany; Param_Test::Fixed_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); Param_Test::Fixed_Array_forany out_any (this->out_); *arg3->value () >>= forany; Param_Test::Fixed_Array_copy (this->out_, forany.in ()); @@ -74,7 +73,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req int Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED/*env*/) +/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -105,25 +104,21 @@ Test_Fixed_Array::reset_parameters (void) } int -Test_Fixed_Array::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Fixed_Array::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_fixed_array (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Fixed_Array::run_sii_test\n"); + ex._tao_print_exception ("Test_Fixed_Array::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index c064b8106fb..4e69fe59287 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -33,15 +33,13 @@ public: ~Test_Fixed_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index 39f02f728b5..fee2186e8a8 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -45,8 +45,7 @@ Test_Fixed_Struct::opname (void) const } void -Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -60,19 +59,19 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = *tmp; CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = *tmp; } int Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED/*env*/) +/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -104,25 +103,21 @@ Test_Fixed_Struct::reset_parameters (void) } int -Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_fixed_struct (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Fixed_Struct::run_sii_test\n"); + ex._tao_print_exception ("Test_Fixed_Struct::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index b791bbe5e3e..07836d0cd7e 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -33,15 +33,13 @@ public: ~Test_Fixed_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index a8fc22b04e7..70a10caa970 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -48,8 +48,7 @@ Test_Multdim_Array::opname (void) const } void -Test_Multdim_Array::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Multdim_Array::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ()); req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ()); @@ -65,19 +64,19 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req Param_Test::Multdim_Array_copy (this->ret_, forany.in ()); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= forany; Param_Test::Multdim_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); } int Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED/*env*/) +/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -132,23 +131,19 @@ Test_Multdim_Array::reset_parameters (void) } int -Test_Multdim_Array::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Multdim_Array::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_multdim_array (this->in_.in (), this->inout_.inout (), - this->out_.inout () - ACE_ENV_ARG_PARAMETER); + this->out_.inout ()); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Multdim_Array::run_sii_test\n"); + ex._tao_print_exception ("Test_Multdim_Array::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index a6ab0243884..0539bf803e7 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -33,15 +33,13 @@ public: ~Test_Multdim_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index dadb75e9c1d..5c93d78c007 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -50,7 +50,7 @@ Test_Nested_Struct::opname (void) const } void -Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) +Test_Nested_Struct::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -64,19 +64,18 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) this->ret_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *arg2->value () >>= tmp; this->inout_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *arg3->value () >>= tmp; this->out_ = new Param_Test::Nested_Struct (*tmp); } int -Test_Nested_Struct::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Nested_Struct::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -129,26 +128,22 @@ Test_Nested_Struct::reset_parameters (void) } int -Test_Nested_Struct::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Nested_Struct::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Nested_Struct_out out (this->out_.out ()); this->ret_ = objref->test_nested_struct (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Nested_Struct::run_sii_test\n"); + ex._tao_print_exception ("Test_Nested_Struct::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 50a456bd479..a22145e958c 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -34,15 +34,13 @@ public: ~Test_Nested_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 4c4d1c7cf4a..3bdde5b4cb5 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -45,8 +45,7 @@ Test_ObjRef::opname (void) const } void -Test_ObjRef::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_ObjRef::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -61,12 +60,12 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req this->ret_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = Coffee::_duplicate (tmp); } @@ -81,15 +80,14 @@ static const char *Coffee_Flavor [] = { }; int -Test_ObjRef::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_ObjRef::init_parameters (Param_Test_ptr objref) { Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator char msg_str[256] = ""; - ACE_TRY + try { ACE_OS::strcpy (msg_str, "make_cofee"); @@ -102,7 +100,7 @@ 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 + this->in_->description (desc); // set the attribute for the in object this->inout_ = Coffee::_nil (); this->out_ = Coffee::_nil (); @@ -110,11 +108,10 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, msg_str); + ex._tao_print_exception (msg_str); } - ACE_ENDTRY; return -1; } @@ -122,7 +119,6 @@ int Test_ObjRef::reset_parameters (void) { // Environemnt variable - ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -130,17 +126,16 @@ Test_ObjRef::reset_parameters (void) CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6); desc.name = Coffee_Flavor [index]; - ACE_TRY + try { // set the attribute of the object - this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object + this->in_->description (desc); // set the attribute for the in object } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "set coffee attribute"); + ex._tao_print_exception ("set coffee attribute"); return -1; } - ACE_ENDTRY; this->inout_ = Coffee::_nil (); this->out_ = Coffee::_nil (); @@ -150,26 +145,22 @@ Test_ObjRef::reset_parameters (void) } int -Test_ObjRef::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_ObjRef::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_objref (this->in_.in (), this->inout_.inout (), - this->out_.out () - ACE_ENV_ARG_PARAMETER); + this->out_.out ()); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ObjRef::run_sii_test\n"); + ex._tao_print_exception ("Test_ObjRef::run_sii_test\n"); } - ACE_ENDTRY; return -1; } @@ -177,9 +168,8 @@ CORBA::Boolean Test_ObjRef::check_validity (void) { // Environemnt variable - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (CORBA::is_nil (this->in_.in ()) || CORBA::is_nil (this->inout_.in ()) @@ -214,12 +204,11 @@ Test_ObjRef::check_validity (void) !ACE_OS::strcmp (in, ret)) return 1; // success } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retrieving description"); + ex._tao_print_exception ("Retrieving description"); return 0; } - ACE_ENDTRY; return 1; } @@ -234,7 +223,6 @@ void Test_ObjRef::print_values (void) { // Env. variable - ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc_var in_desc; Coffee::Desc_var inout_desc; @@ -244,7 +232,7 @@ Test_ObjRef::print_values (void) const char *out = 0; const char *inout = 0; const char *ret = 0; - ACE_TRY + try { if (!CORBA::is_nil (this->in_.in ())) { @@ -274,12 +262,11 @@ Test_ObjRef::print_values (void) ret = ret_desc->name.in (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retrieving Description"); + ex._tao_print_exception ("Retrieving Description"); return; } - ACE_ENDTRY; diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index 023829729fc..a6d491eb90e 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -33,15 +33,13 @@ public: ~Test_ObjRef (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index 444df058841..b5dc1e676ad 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -50,8 +50,7 @@ Test_Objref_Struct::opname (void) const } void -Test_Objref_Struct::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Objref_Struct::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,21 +65,20 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Objref_Struct (*tmp); } int -Test_Objref_Struct::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Objref_Struct::init_parameters (Param_Test_ptr objref) { - ACE_TRY + try { Generator *gen = GENERATOR::instance (); // value generator @@ -92,8 +90,7 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref Coffee::Desc d; d.name = gen->gen_string (); - this->in_.y->description (d - ACE_ENV_ARG_PARAMETER); + this->in_.y->description (d); this->inout_->x = 0; @@ -104,13 +101,11 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Objref_Struct::init_parameters\n"); + ex._tao_print_exception ("Test_Objref_Struct::init_parameters\n"); } - ACE_ENDTRY; return -1; } @@ -132,27 +127,23 @@ Test_Objref_Struct::reset_parameters (void) } int -Test_Objref_Struct::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Objref_Struct::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Objref_Struct_out out (this->out_.out ()); this->ret_ = objref->test_objref_struct (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Objref_Struct::run_sii_test\n"); + ex._tao_print_exception ("Test_Objref_Struct::run_sii_test\n"); } - ACE_ENDTRY; return -1; } @@ -164,9 +155,8 @@ Test_Objref_Struct::check_validity (void) || this->in_.x != this->ret_->x) return 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (CORBA::is_nil (this->in_.y.in ()) || CORBA::is_nil (this->out_->y.in ()) @@ -193,13 +183,11 @@ Test_Objref_Struct::check_validity (void) return 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Objref_Struct::check_validity\n"); + ex._tao_print_exception ("Test_Objref_Struct::check_validity\n"); } - ACE_ENDTRY; return 0; } @@ -223,9 +211,8 @@ Test_Objref_Struct::print_values (void) this->out_->x, this->ret_->x )); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Coffee::Desc_var s_in = this->in_.y->description (); @@ -263,10 +250,8 @@ Test_Objref_Struct::print_values (void) s_out->name.in (), s_ret->name.in () )); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Objref_Struct::print_values\n"); + ex._tao_print_exception ("Test_Objref_Struct::print_values\n"); } - ACE_ENDTRY; } diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index 8a2aaf06665..e9f7164f903 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -34,15 +34,13 @@ public: ~Test_Objref_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index fbdf0f0a978..3ab158d6599 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -40,7 +40,7 @@ Coffee_i::~Coffee_i (void) // get attribute Coffee::Desc * -Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) +Coffee_i::description ( /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; @@ -51,7 +51,7 @@ Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) // set attribute void Coffee_i::description (const Coffee::Desc &description - ACE_ENV_ARG_DECL_NOT_USED /*env*/) + /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); @@ -79,8 +79,7 @@ Param_Test_i::~Param_Test_i (void) CORBA::Short Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, - CORBA::Short_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Short_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = (CORBA::Short) (s1 * 2); @@ -98,8 +97,7 @@ Param_Test_i::test_short (CORBA::Short s1, CORBA::ULongLong Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, - CORBA::ULongLong_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULongLong_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; @@ -113,8 +111,7 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1, char * Param_Test_i::test_unbounded_string (const char *s1, char *&s2, - CORBA::String_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::String_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -132,8 +129,7 @@ Param_Test_i::test_unbounded_string (const char *s1, char * Param_Test_i::test_bounded_string (const char *s1, char *&s2, - CORBA::String_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::String_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -151,8 +147,7 @@ Param_Test_i::test_bounded_string (const char *s1, CORBA::WChar * Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::WString_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -174,8 +169,7 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar * Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::WString_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -195,8 +189,7 @@ Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, Param_Test::Fixed_Struct Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, - Param_Test::Fixed_Struct_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Fixed_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; @@ -209,8 +202,7 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, CORBA::LongSeq * Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1, CORBA::LongSeq & s2, - CORBA::LongSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::LongSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::LongSeq @@ -227,8 +219,7 @@ Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1, CORBA::ShortSeq * Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1, CORBA::ShortSeq & s2, - CORBA::ShortSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ShortSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ShortSeq @@ -245,8 +236,7 @@ Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1, Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_Short_Seq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq @@ -263,8 +253,7 @@ Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_Long_Seq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq @@ -281,8 +270,7 @@ Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s CORBA::StringSeq * Param_Test_i::test_strseq (const CORBA::StringSeq &s1, CORBA::StringSeq &s2, - CORBA::StringSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::StringSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -317,8 +305,7 @@ Param_Test_i::test_strseq (const CORBA::StringSeq &s1, Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_StrSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -338,8 +325,7 @@ Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, CORBA::WStringSeq * Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1, CORBA::WStringSeq &ws2, - CORBA::WStringSeq_out ws3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::WStringSeq_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -359,8 +345,7 @@ Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1, Param_Test::Bounded_WStrSeq * Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, - Param_Test::Bounded_WStrSeq_out ws3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_WStrSeq_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -381,8 +366,7 @@ Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1, Param_Test::StructSeq * Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, - Param_Test::StructSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::StructSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -404,8 +388,7 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_StructSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq @@ -423,8 +406,7 @@ Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::PathSpec_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec @@ -456,8 +438,7 @@ Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::ArraySeq * Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::ArraySeq &s2, - Param_Test::ArraySeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::ArraySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -479,8 +460,7 @@ Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::Bounded_ArraySeq * Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, - Param_Test::Bounded_ArraySeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_ArraySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_ArraySeq @@ -497,8 +477,7 @@ Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Coffee_Mix_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix @@ -540,8 +519,7 @@ Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Bounded_Coffee_Mix_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix @@ -583,8 +561,7 @@ Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, CORBA::AnySeq * Param_Test_i::test_anyseq (const CORBA::AnySeq &s1, CORBA::AnySeq &s2, - CORBA::AnySeq_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::AnySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -607,8 +584,7 @@ Param_Test_i::test_anyseq (const CORBA::AnySeq &s1, Param_Test::Var_Struct * Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, - Param_Test::Var_Struct_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Var_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -629,8 +605,7 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Nested_Struct * Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, - Param_Test::Nested_Struct_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Nested_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -651,8 +626,7 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Recursive_Struct * Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Recursive_Struct &s2, - Param_Test::Recursive_Struct_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Recursive_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -672,8 +646,7 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Objref_Struct * Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, - Param_Test::Objref_Struct_out s3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Objref_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -702,21 +675,19 @@ Param_Test_i::make_coffee (void) Coffee_ptr Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, - Coffee_out o3 - ACE_ENV_ARG_DECL) + Coffee_out o3) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); - ACE_TRY + try { Coffee_var myobj = obj_._this (); if (!CORBA::is_nil (o2)) CORBA::release (o2); - CORBA::Boolean equiv = myobj->_is_equivalent (o1 - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean equiv = myobj->_is_equivalent (o1); if (equiv) { @@ -730,17 +701,16 @@ Param_Test_i::test_objref (Coffee_ptr o1, o3 = Coffee::_nil (); } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); // env.exception (TAO_TRY_ENV.exception ()); } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); // env.exception (TAO_TRY_ENV.exception ()); } - ACE_ENDTRY; return ret; } @@ -750,7 +720,7 @@ CORBA::TypeCode_ptr Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, CORBA::TypeCode_out t3 - ACE_ENV_ARG_DECL_NOT_USED/*env*/) +/*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others @@ -764,8 +734,7 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::Any * Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3 - ACE_ENV_ARG_DECL) + CORBA::Any_out a3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any *ret; @@ -930,8 +899,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, Param_Test::Fixed_Array_slice * Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, - Param_Test::Fixed_Array_out a3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Fixed_Array_out a3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -946,8 +914,7 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Var_Array_slice * Param_Test_i::test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, - Param_Test::Var_Array_out a3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Var_Array_out a3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -961,8 +928,7 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1, CORBA::ULong Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, - CORBA::ULong_out s3 - ACE_ENV_ARG_DECL) + CORBA::ULong_out s3) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)) { @@ -999,8 +965,7 @@ Param_Test_i::test_exception (CORBA::ULong s1, Param_Test::Big_Union* Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, - Param_Test::Big_Union_out u3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Big_Union_out u3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); @@ -1012,8 +977,7 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Small_Union Param_Test_i::test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, - Param_Test::Small_Union_out u3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Small_Union_out u3) ACE_THROW_SPEC ((CORBA::SystemException)) { u2 = u1; @@ -1024,8 +988,7 @@ Param_Test_i::test_small_union (const Param_Test::Small_Union& u1, Param_Test::Recursive_Union* Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, - Param_Test::Recursive_Union_out ru3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Recursive_Union_out ru3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1)); @@ -1037,8 +1000,7 @@ Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1, CORBA::Any* Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3 - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Any_out a3) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); @@ -1050,8 +1012,7 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1, Param_Test::Multdim_Array_slice * Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, Param_Test::Multdim_Array a2, - Param_Test::Multdim_Array_out a3 - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Multdim_Array_out a3) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Multdim_Array_slice *ret; @@ -1072,5 +1033,5 @@ Param_Test_i::shutdown (void) void Param_Test_i::throw_badboy (void) { - ACE_THROW (Param_Test::BadBoy ()); + 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 c35af9e5f29..500fa3ad36f 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -35,8 +35,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute - virtual void description (const Coffee::Desc &description - ACE_ENV_ARG_DECL) + virtual void description (const Coffee::Desc &description) ACE_THROW_SPEC ((CORBA::SystemException)); // set attribute @@ -62,51 +61,44 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, - CORBA::Short_out s3 - ACE_ENV_ARG_DECL) + CORBA::Short_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for shorts virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, - CORBA::ULongLong_out s3 - ACE_ENV_ARG_DECL) + CORBA::ULongLong_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unsigned long long virtual char *test_unbounded_string (const char *s1, char *&s2, - CORBA::String_out s3 - ACE_ENV_ARG_DECL) + CORBA::String_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded strings virtual char *test_bounded_string (const char *s1, char *&s2, - CORBA::String_out s3 - ACE_ENV_ARG_DECL) + CORBA::String_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded strings virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3 - ACE_ENV_ARG_DECL) + CORBA::WString_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded wstrings virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3 - ACE_ENV_ARG_DECL) + CORBA::WString_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded wstrings virtual Param_Test::Fixed_Struct test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, - Param_Test::Fixed_Struct_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Fixed_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed structures @@ -114,130 +106,110 @@ public: virtual CORBA::LongSeq * test_long_sequence ( const CORBA::LongSeq & s1, CORBA::LongSeq & s2, - CORBA::LongSeq_out s3 - ACE_ENV_ARG_DECL) + CORBA::LongSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence ( const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_Long_Seq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ShortSeq * test_short_sequence ( const CORBA::ShortSeq & s1, CORBA::ShortSeq & s2, - CORBA::ShortSeq_out s3 - ACE_ENV_ARG_DECL) + CORBA::ShortSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence ( const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_Short_Seq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::StringSeq * test_strseq ( const CORBA::StringSeq & s1, CORBA::StringSeq & s2, - CORBA::StringSeq_out s3 - ACE_ENV_ARG_DECL) + CORBA::StringSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StrSeq * test_bounded_strseq ( const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_StrSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::WStringSeq * test_wstrseq ( const CORBA::WStringSeq & ws1, CORBA::WStringSeq & ws2, - CORBA::WStringSeq_out ws3 - ACE_ENV_ARG_DECL) + CORBA::WStringSeq_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq ( const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, - Param_Test::Bounded_WStrSeq_out ws3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_WStrSeq_out ws3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StructSeq * test_struct_sequence ( const Param_Test::StructSeq & s1, Param_Test::StructSeq & s2, - Param_Test::StructSeq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::StructSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::PathSpec * test_unbounded_struct_sequence ( const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3 - ACE_ENV_ARG_DECL) + Param_Test::PathSpec_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence ( const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_StructSeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::ArraySeq * test_array_sequence ( const Param_Test::ArraySeq & s1, Param_Test::ArraySeq & s2, - Param_Test::ArraySeq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::ArraySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence ( const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, - Param_Test::Bounded_ArraySeq_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_ArraySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Coffee_Mix * test_coffe_mix ( const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Coffee_Mix_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix ( const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Bounded_Coffee_Mix_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::AnySeq * test_anyseq ( const CORBA::AnySeq & s1, CORBA::AnySeq & s2, - CORBA::AnySeq_out s3 - ACE_ENV_ARG_DECL) + CORBA::AnySeq_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... virtual Param_Test::Var_Struct * test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, - Param_Test::Var_Struct_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Var_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for variable structs virtual Param_Test::Nested_Struct * test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, - Param_Test::Nested_Struct_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Nested_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for nested structs virtual Param_Test::Recursive_Struct * test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, - Param_Test::Recursive_Struct_out rs3 - ACE_ENV_ARG_DECL) + Param_Test::Recursive_Struct_out rs3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for recursive structs virtual Param_Test::Objref_Struct * test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, - Param_Test::Objref_Struct_out s3 - ACE_ENV_ARG_DECL) + Param_Test::Objref_Struct_out s3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr @@ -248,84 +220,73 @@ public: virtual Coffee_ptr test_objref (Coffee_ptr o1, Coffee_ptr &o2, - Coffee_out o3 - ACE_ENV_ARG_DECL) + Coffee_out o3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for object references virtual CORBA::TypeCode_ptr test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, - CORBA::TypeCode_out o3 - ACE_ENV_ARG_DECL) + CORBA::TypeCode_out o3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for typecodes virtual CORBA::Any * test_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3 - ACE_ENV_ARG_DECL) + CORBA::Any_out a3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for Anys virtual Param_Test::Fixed_Array_slice * test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, - Param_Test::Fixed_Array_out a3 - ACE_ENV_ARG_DECL) + Param_Test::Fixed_Array_out a3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed size arrays virtual Param_Test::Var_Array_slice * test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, - Param_Test::Var_Array_out a3 - ACE_ENV_ARG_DECL) + Param_Test::Var_Array_out a3) ACE_THROW_SPEC ((CORBA::SystemException)); // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, CORBA::ULong& s2, - CORBA::ULong_out s3 - ACE_ENV_ARG_DECL) + CORBA::ULong_out s3) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)); virtual Param_Test::Big_Union* test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, - Param_Test::Big_Union_out u3 - ACE_ENV_ARG_DECL) + Param_Test::Big_Union_out u3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Small_Union test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, - Param_Test::Small_Union_out u3 - ACE_ENV_ARG_DECL) + Param_Test::Small_Union_out u3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Recursive_Union* test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, - Param_Test::Recursive_Union_out ru3 - ACE_ENV_ARG_DECL) + Param_Test::Recursive_Union_out ru3) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any* test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3 - ACE_ENV_ARG_DECL) + CORBA::Any_out a3) ACE_THROW_SPEC ((CORBA::SystemException)); // Test for multi dimensional arrays virtual Param_Test::Multdim_Array_slice * test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , - Param_Test::Multdim_Array_out - ACE_ENV_ARG_DECL_NOT_USED) + Param_Test::Multdim_Array_out) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 9117f8712ef..8558d1ac351 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -49,8 +49,7 @@ Test_Recursive_Struct::opname (void) const } void -Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Struct (*tmp); } int -Test_Recursive_Struct::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Recursive_Struct::init_parameters (Param_Test_ptr) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -115,27 +113,23 @@ Test_Recursive_Struct::reset_parameters (void) } int -Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Recursive_Struct_out out (this->out_.out ()); this->ret_ = objref->test_recursive_struct (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Recursive_Struct::run_sii_test\n"); + ex._tao_print_exception ("Test_Recursive_Struct::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h index 18175cb53bd..77d1ee7dabc 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -35,15 +35,13 @@ public: ~Test_Recursive_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -58,8 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index c636c7e7300..1129f5b22cc 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -49,8 +49,7 @@ Test_Recursive_Union::opname (void) const } void -Test_Recursive_Union::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Recursive_Union::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Union (*tmp); } int -Test_Recursive_Union::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Recursive_Union::init_parameters (Param_Test_ptr) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -117,27 +115,23 @@ Test_Recursive_Union::reset_parameters (void) } int -Test_Recursive_Union::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Recursive_Union::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Recursive_Union_out out (this->out_.out ()); this->ret_ = objref->test_recursive_union (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Recursive_Union::run_sii_test\n"); + ex._tao_print_exception ("Test_Recursive_Union::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h index 5ebeaac1dd7..6f41e85292c 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -35,15 +35,13 @@ public: ~Test_Recursive_Union (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -58,8 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp index b2a12a29bd5..29299e2945e 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -21,7 +21,7 @@ #include "ace/Log_Msg.h" ACE_RCSID (Param_Test, - results, + results, "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp") Results::Results (void) @@ -104,8 +104,7 @@ Results::print_stats (void) } void -Results::print_exception (const char * /* call_name */ - ACE_ENV_ARG_DECL_NOT_USED) +Results::print_exception (const char * /* call_name */) { //ACE_PRINT_EXCEPTION (call_name); } diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h index 7c7857acd6c..e04e26e5f3c 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -47,8 +47,7 @@ public: void print_stats (void); // prints the time stats - void print_exception (const char *call_name - ACE_ENV_ARG_DECL_NOT_USED); + void print_exception (const char *call_name); // print the exception void start_timer (void); diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index fd3e41e0f40..f519529eb28 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -61,27 +61,25 @@ main (int argc, char *argv[]) PortableServer::POA_var oa_ptr; Param_Test_i *param_test = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name); CORBA::Object_var temp; // holder for the myriad of times we get // an object which we then have to narrow. // Get the Root POA - temp = orb_ptr->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + temp = orb_ptr->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (temp.in())) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to get root poa reference.\n"), 1); - oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); + oa_ptr = PortableServer::POA::_narrow (temp.in()); PortableServer::POAManager_var poa_manager = oa_ptr->the_POAManager (); @@ -89,20 +87,17 @@ main (int argc, char *argv[]) CORBA::PolicyList policies (2); policies.length (2); policies[0] = - oa_ptr->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + oa_ptr->create_id_assignment_policy (PortableServer::USER_ID); policies[1] = - oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT); // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. PortableServer::POA_var good_poa = oa_ptr->create_POA ("child_poa", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Parse remaining command line and verify parameters. parse_args (argc, argv); @@ -119,18 +114,16 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("param_test"); good_poa->activate_object_with_id (id.in (), - param_test - ACE_ENV_ARG_PARAMETER); + param_test); // 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); + temp = good_poa->id_to_reference (id.in ()); CORBA::String_var str = - orb_ptr->object_to_string (temp.in () - ACE_ENV_ARG_PARAMETER); + orb_ptr->object_to_string (temp.in ()); if (TAO_debug_level > 0) { @@ -161,24 +154,21 @@ main (int argc, char *argv[]) orb_ptr->run (); good_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); oa_ptr->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_CATCH (CORBA::UserException, userex) + catch (const CORBA::UserException& userex) { - ACE_PRINT_EXCEPTION (userex, "User Exception"); + userex._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; // Free resources delete param_test; diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index 5fe6e403958..b6975dfe98e 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -45,8 +45,7 @@ Test_Short::opname (void) const } void -Test_Short::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Short::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -59,17 +58,16 @@ Test_Short::dii_req_invoke (CORBA::Request *req req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= this->out_; } int -Test_Short::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED) +Test_Short::init_parameters (Param_Test_ptr /*objref*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -88,25 +86,21 @@ Test_Short::reset_parameters (void) } int -Test_Short::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Short::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_short (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Short::run_sii_test\n"); + ex._tao_print_exception ("Test_Short::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index 5157b673c74..2396e70663f 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -33,15 +33,13 @@ public: ~Test_Short (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index bc59b246fd8..2947a1221f0 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -47,8 +47,7 @@ Test_Small_Union::opname (void) const } void -Test_Small_Union::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Small_Union::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -63,21 +62,20 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Small_Union (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Small_Union (*tmp); } int -Test_Small_Union::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Small_Union::init_parameters (Param_Test_ptr objref) { - ACE_TRY + try { // get access to a Coffee Object this->cobj_ = objref->make_coffee (); @@ -85,15 +83,15 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref this->reset_parameters (); return 0; } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee"); + sysex._tao_print_exception ("System Exception doing make_coffee"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee"); + ex._tao_print_exception ( + "An exception caught in make_coffee"); } - ACE_ENDTRY; return -1; } @@ -127,25 +125,21 @@ Test_Small_Union::reset_parameters (void) } int -Test_Small_Union::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Small_Union::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_small_union (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Small_Union::run_sii_test\n"); + ex._tao_print_exception ("Test_Small_Union::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h index bea055565b4..8e3b1834cab 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -33,15 +33,13 @@ public: ~Test_Small_Union (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index 3f35c5fcc6a..d9477651899 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -45,8 +45,7 @@ Test_TypeCode::opname (void) const } void -Test_TypeCode::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_TypeCode::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -61,19 +60,18 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = CORBA::TypeCode::_duplicate (tmp); } int -Test_TypeCode::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_TypeCode::init_parameters (Param_Test_ptr) { static CORBA::TypeCode_ptr tc_table [] = { @@ -114,61 +112,51 @@ Test_TypeCode::reset_parameters (void) } int -Test_TypeCode::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_TypeCode::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { - this->init_parameters (objref ACE_ENV_ARG_PARAMETER); + this->init_parameters (objref); CORBA::TypeCode_out out (this->out_); this->ret_ = objref->test_typecode (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_TypeCode::run_sii_test\n"); + ex._tao_print_exception ("Test_TypeCode::run_sii_test\n"); } - ACE_ENDTRY; return -1; } CORBA::Boolean Test_TypeCode::check_validity (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::Boolean one, two, three; - one = this->in_.in ()->equal (this->inout_.in () - ACE_ENV_ARG_PARAMETER); + one = this->in_.in ()->equal (this->inout_.in ()); - two = this->in_.in ()->equal (this->out_.in () - ACE_ENV_ARG_PARAMETER); + two = this->in_.in ()->equal (this->out_.in ()); - three = this->in_.in ()->equal (this->ret_.in () - ACE_ENV_ARG_PARAMETER); + three = this->in_.in ()->equal (this->ret_.in ()); if (one && two && three) return 1; else return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_TypeCode::check_validity\n"); + ex._tao_print_exception ("Test_TypeCode::check_validity\n"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index bb369324d6e..1b4a2183f50 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -33,15 +33,13 @@ public: ~Test_TypeCode (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index d059728a3cd..e9863a613ac 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -53,8 +53,7 @@ Test_AnySeq::opname (void) const } void -Test_AnySeq::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_AnySeq::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -69,19 +68,18 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::AnySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new CORBA::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::AnySeq (*tmp); } int -Test_AnySeq::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_AnySeq::init_parameters (Param_Test_ptr objref) { Generator *gen = GENERATOR::instance (); // value generator @@ -120,7 +118,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "setting coffee object \n" )); - ACE_TRY + try { // get access to a Coffee Object Coffee_var cobj = objref->make_coffee (); @@ -129,13 +127,12 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref this->in_[i] <<= cobj.in (); this->inout_[i] <<= 0; // different from in_ } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, - "System Exception doing make_coffee"); + sysex._tao_print_exception ( + "System Exception doing make_coffee"); return -1; } - ACE_ENDTRY; } break; case 3: @@ -195,27 +192,23 @@ Test_AnySeq::reset_parameters (void) int -Test_AnySeq::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_AnySeq::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::AnySeq_out out (this->out_.out ()); this->ret_ = objref->test_anyseq (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_AnySeq::run_sii_test\n"); + ex._tao_print_exception ("Test_AnySeq::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index 3a2d6c72577..c5431e8314c 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -33,15 +33,13 @@ public: ~Test_AnySeq (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index a672933cecb..821163fe4a7 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -50,8 +50,7 @@ Test_Array_Sequence::opname (void) const } void -Test_Array_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Array_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,19 +65,18 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::ArraySeq (*tmp); } int -Test_Array_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Array_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -126,27 +124,23 @@ Test_Array_Sequence::reset_parameters (void) } int -Test_Array_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Array_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::ArraySeq_out out (this->out_.out ()); this->ret_ = objref->test_array_sequence (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Array_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Array_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h index ce888926d2e..258c2531567 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -34,15 +34,13 @@ public: ~Test_Array_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,8 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index fb026404ab5..698c50e153b 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -49,8 +49,7 @@ Test_Long_Sequence::opname (void) const } void -Test_Long_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Long_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::LongSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::LongSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = CORBA::LongSeq (*tmp); } int -Test_Long_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Long_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -106,27 +104,23 @@ Test_Long_Sequence::reset_parameters (void) } int -Test_Long_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Long_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::LongSeq_out out (this->out_.out ()); this->ret_ = objref->test_long_sequence (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Long_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Long_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index 6cfdef9dc3d..4787743e140 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -34,15 +34,13 @@ public: ~Test_Long_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index 247ddfaf5f2..8f796313893 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -59,8 +59,7 @@ Test_ObjRef_Sequence::opname (void) const } void -Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -75,21 +74,20 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Coffee_Mix (*tmp); } int -Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref) { - ACE_TRY + try { Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -114,19 +112,16 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref // set the attribute for the in object Coffee_ptr tmp = this->in_[i]; - tmp->description (desc - ACE_ENV_ARG_PARAMETER); + tmp->description (desc); } return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ObjRef_Sequence::init_parameters\n"); + ex._tao_print_exception ("Test_ObjRef_Sequence::init_parameters\n"); } - ACE_ENDTRY; return -1; } @@ -140,58 +135,48 @@ Test_ObjRef_Sequence::reset_parameters (void) } int -Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Coffee_Mix_out out (this->out_.out ()); this->ret_ = objref->test_coffe_mix (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ObjRef_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_ObjRef_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } CORBA::Boolean Test_ObjRef_Sequence::check_validity (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->compare (this->in_, - this->inout_.in () - ACE_ENV_ARG_PARAMETER); + this->inout_.in ()); this->compare (this->in_, - this->out_.in () - ACE_ENV_ARG_PARAMETER); + this->out_.in ()); this->compare (this->in_, - this->ret_.in () - ACE_ENV_ARG_PARAMETER); + this->ret_.in ()); return 1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ObjRef_Sequence::check_validity"); + ex._tao_print_exception ("Test_ObjRef_Sequence::check_validity"); } - ACE_ENDTRY; return 0; } @@ -225,10 +210,9 @@ Test_ObjRef_Sequence::print_values (void) CORBA::Boolean Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, - const Param_Test::Coffee_Mix &s2 - ACE_ENV_ARG_DECL) + const Param_Test::Coffee_Mix &s2) { - ACE_TRY + try { if (s1.maximum () != s2.maximum ()) { @@ -270,13 +254,11 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, return 1; // success } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ObjRef_Sequence::compare"); + ex._tao_print_exception ("Test_ObjRef_Sequence::compare"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index f087101b08b..21f3639dd08 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -34,15 +34,13 @@ public: ~Test_ObjRef_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,13 +55,12 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1, - const Param_Test::Coffee_Mix &s2 - ACE_ENV_ARG_DECL); + const Param_Test::Coffee_Mix &s2); // compare void print_sequence (const Param_Test::Coffee_Mix &s); diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index 9ade673571a..3319e89c703 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -49,8 +49,7 @@ Test_Short_Sequence::opname (void) const } void -Test_Short_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Short_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::ShortSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new CORBA::ShortSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::ShortSeq (*tmp); } int -Test_Short_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Short_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -108,27 +106,23 @@ Test_Short_Sequence::reset_parameters (void) } int -Test_Short_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Short_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::ShortSeq_out out (this->out_.out ()); this->ret_ = objref->test_short_sequence (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Short_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Short_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index 7cf0a4499f5..a200873eadd 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -34,15 +34,13 @@ public: ~Test_Short_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 461de5233ba..db7eead2aa5 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -49,8 +49,7 @@ Test_String_Sequence::opname (void) const } void -Test_String_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_String_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -65,19 +64,18 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::StringSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new CORBA::StringSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::StringSeq (*tmp); } int -Test_String_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_String_Sequence::init_parameters (Param_Test_ptr) { const char *choiceList[] = { @@ -112,27 +110,23 @@ Test_String_Sequence::reset_parameters (void) } int -Test_String_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_String_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::StringSeq_out out (this->out_.out ()); this->ret_ = objref->test_strseq (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_String_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_String_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 069bdf2351e..b58373550da 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -34,15 +34,13 @@ public: ~Test_String_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index a44252ce1f3..ae253a1e54b 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -57,8 +57,7 @@ Test_Unbounded_String::opname (void) const } void -Test_Unbounded_String::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Unbounded_String::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -76,19 +75,18 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = CORBA::string_dup (tmp); } int -Test_Unbounded_String::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Unbounded_String::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,27 +122,23 @@ Test_Unbounded_String::reset_parameters (void) } int -Test_Unbounded_String::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Unbounded_String::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::String_out str_out (this->out_); this->ret_ = objref->test_unbounded_string (this->in_, this->inout_, - str_out - ACE_ENV_ARG_PARAMETER); + str_out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Unbounded_String::run_sii_test\n"); + ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index ed721972028..834c4bfbcb2 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -33,15 +33,13 @@ public: ~Test_Unbounded_String (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 49db2cf09d9..fbe85b62655 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -50,8 +50,7 @@ Test_Struct_Sequence::opname (void) const } void -Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,19 +65,18 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::StructSeq (*tmp); } int -Test_Struct_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Struct_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -109,27 +107,23 @@ Test_Struct_Sequence::reset_parameters (void) } int -Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::StructSeq_out out (this->out_.out ()); this->ret_ = objref->test_struct_sequence (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Struct_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } @@ -253,8 +247,7 @@ Test_Unbounded_Struct_Sequence::opname (void) const } void -Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -269,19 +262,18 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::PathSpec (*tmp); } int -Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -313,14 +305,12 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) } int -Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref) { Param_Test::PathSpec_out out (this->out_.out ()); this->ret_ = objref->test_unbounded_struct_sequence (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 00ce057526d..7459c7892f1 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -34,15 +34,13 @@ public: ~Test_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: @@ -97,15 +95,13 @@ public: ~Test_Unbounded_Struct_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -120,7 +116,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. protected: diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index 379e35214e0..5761f22f962 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -50,8 +50,7 @@ Test_WString_Sequence::opname (void) const } void -Test_WString_Sequence::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_WString_Sequence::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,19 +65,18 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::WStringSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new CORBA::WStringSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new CORBA::WStringSeq (*tmp); } int -Test_WString_Sequence::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_WString_Sequence::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -108,27 +106,23 @@ Test_WString_Sequence::reset_parameters (void) } int -Test_WString_Sequence::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_WString_Sequence::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::WStringSeq_out out (this->out_.out ()); this->ret_ = objref->test_wstrseq (this->in_.in (), this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_WString_Sequence::run_sii_test\n"); + ex._tao_print_exception ("Test_WString_Sequence::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index 6c212efc388..5351240f41c 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -34,15 +34,13 @@ public: ~Test_WString_Sequence (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,8 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index 0adb35e7ebe..fe1d49c4f69 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -58,8 +58,7 @@ Test_Unbounded_WString::opname (void) const } void -Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -77,19 +76,18 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = CORBA::wstring_dup (tmp); } int -Test_Unbounded_WString::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Unbounded_WString::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,27 +122,23 @@ Test_Unbounded_WString::reset_parameters (void) } int -Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { CORBA::WString_out str_out (this->out_); this->ret_ = objref->test_unbounded_wstring (this->in_, this->inout_, - str_out - ACE_ENV_ARG_PARAMETER); + str_out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Unbounded_WString::run_sii_test\n"); + ex._tao_print_exception ("Test_Unbounded_WString::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h index 04497648c11..0c11b453c98 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -33,15 +33,13 @@ public: ~Test_Unbounded_WString (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,8 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * - ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index cdd06db2f10..3098bf9f256 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -41,8 +41,7 @@ Test_ULongLong::opname (void) const } void -Test_ULongLong::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_ULongLong::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -55,17 +54,16 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= this->out_; } int -Test_ULongLong::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_ULongLong::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -84,26 +82,22 @@ Test_ULongLong::reset_parameters (void) } int -Test_ULongLong::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_ULongLong::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_ulonglong (this->in_, this->inout_, - this->out_ - ACE_ENV_ARG_PARAMETER); + this->out_); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_ULongLong::run_sii_test\n"); + ex._tao_print_exception ("Test_ULongLong::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index db9e1fa86a4..c143ef00a70 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -30,15 +30,13 @@ public: ~Test_ULongLong (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -53,7 +51,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index aee46a70b8a..96d64aa76c9 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -47,8 +47,7 @@ Test_Var_Array::opname (void) const } void -Test_Var_Array::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Var_Array::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_); @@ -64,19 +63,18 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req this->ret_ = Param_Test::Var_Array_dup (forany.in ()); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= forany; Param_Test::Var_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= forany; this->out_ = Param_Test::Var_Array_dup (forany.in ()); } int -Test_Var_Array::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Var_Array::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -102,26 +100,22 @@ Test_Var_Array::reset_parameters (void) } int -Test_Var_Array::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Var_Array::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Var_Array_out out_arr (this->out_.out ()); this->ret_ = objref->test_var_array (this->in_, this->inout_, - out_arr - ACE_ENV_ARG_PARAMETER); + out_arr); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Var_Array::run_sii_test\n"); + ex._tao_print_exception ("Test_Var_Array::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 07d33162104..1a9b4e5c08f 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -33,15 +33,13 @@ public: ~Test_Var_Array (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -56,7 +54,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index 7b944bded68..5bf90ad5044 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -50,8 +50,7 @@ Test_Var_Struct::opname (void) const } void -Test_Var_Struct::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Var_Struct::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,19 +65,18 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (1); *o2->value () >>= tmp; this->inout_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); + req->arguments ()->item (2); *o3->value () >>= tmp; this->out_ = new Param_Test::Var_Struct (*tmp); } int -Test_Var_Struct::init_parameters (Param_Test_ptr - ACE_ENV_ARG_DECL_NOT_USED) +Test_Var_Struct::init_parameters (Param_Test_ptr) { Generator *gen = GENERATOR::instance (); // value generator @@ -132,26 +130,22 @@ Test_Var_Struct::reset_parameters (void) } int -Test_Var_Struct::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Var_Struct::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { Param_Test::Var_Struct_out out (this->out_.out ()); this->ret_ = objref->test_var_struct (this->in_, this->inout_.inout (), - out - ACE_ENV_ARG_PARAMETER); + out); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Var_Struct::run_sii_test\n"); + ex._tao_print_exception ("Test_Var_Struct::run_sii_test\n"); } - ACE_ENDTRY; return -1; } diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index aab34fe5247..79f15ff4ded 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -34,15 +34,13 @@ public: ~Test_Var_Struct (void); // dtor - int run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int run_sii_test (Param_Test_ptr objref); // run the SII test const char *opname (void) const; // return operation name - int init_parameters (Param_Test_ptr objref - ACE_ENV_ARG_DECL); + int init_parameters (Param_Test_ptr objref); // set values for parameters int reset_parameters (void); @@ -57,7 +55,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request *); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp index 48d075e99f2..cf3e5176b71 100644 --- a/TAO/tests/Permanent_Forward/StubTest.cpp +++ b/TAO/tests/Permanent_Forward/StubTest.cpp @@ -74,9 +74,9 @@ equal_endpoint (TAO_Profile *profile, TAO_Profile *other) 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); + CORBA::String_var str = orb->object_to_string (obj); - CORBA::Object_var obj_copy = orb->string_to_object (str.in () ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj_copy = orb->string_to_object (str.in ()); TAO_Stub *stub_copy = obj_copy->_stubobj (); TAO_MProfile *copy_mprofile = &(stub_copy->base_profiles ()); @@ -99,10 +99,10 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil 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); + CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService"); // 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); + CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService"); TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub4 = obj4->_stubobj (); @@ -144,15 +144,15 @@ test_forward_permanent (CORBA::ORB_ptr orb) 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); + CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService"); - 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); + CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService"); - 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); + CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService"); - 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); + CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService"); - 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); + CORBA::Object_var obj5 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:5555,iiop:192.168.1.3:5555/NameService"); TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub2 = obj2->_stubobj (); @@ -255,11 +255,11 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb) 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); + CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService"); - 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); + CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService"); - 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); + CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService"); TAO_Stub *stub1 = obj1->_stubobj (); TAO_Stub *stub2 = obj2->_stubobj (); @@ -324,32 +324,27 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the Stub Tests.\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Retrieve the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); test_forward (orb.in()); test_forward_permanent (orb.in()); test_forward_permanent_mix (orb.in()); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, - "Unexpected system Exception!!\n"); + sysex._tao_print_exception ("Unexpected system Exception!!\n"); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected ACE_CATCHANY Exception!\n"); + ex._tao_print_exception ("Unexpected CORBA Exception!\n"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Stub Tests Successfully Completed!\n")); ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 149250464a4..b5fb71ef296 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -66,8 +66,7 @@ private: void perform_iteration (ACE_RANDR_TYPE &seed, CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, - CORBA::PolicyCurrent_ptr policy_current - ACE_ENV_ARG_DECL); + CORBA::PolicyCurrent_ptr policy_current); private: CORBA::ORB_var orb_; @@ -83,17 +82,16 @@ private: int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR" - ACE_ENV_ARG_PARAMETER); + orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR"); Test_var test = TAO::Narrow_Utils<Test>::unchecked_narrow ( @@ -121,13 +119,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -147,10 +143,9 @@ void Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, - CORBA::PolicyCurrent_ptr policy_current - ACE_ENV_ARG_DECL) + CORBA::PolicyCurrent_ptr policy_current) { - ACE_TRY + try { int r = ACE_OS::rand_r (seed); @@ -208,8 +203,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, } policy = this->orb_->create_policy (policy_type, - any - ACE_ENV_ARG_PARAMETER); + any); CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE; if (operation == ADD_OBJECT_POLICY @@ -228,23 +222,20 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, { CORBA::Object_var tmp = this->test_->_set_policy_overrides (policy_list, - override_type - ACE_ENV_ARG_PARAMETER); + override_type); } else if (operation == ADD_CURRENT_POLICY || operation == SET_CURRENT_POLICY) { policy_current->set_policy_overrides (policy_list, - override_type - ACE_ENV_ARG_PARAMETER); + override_type); } else { // operation == ADD_CURRENT_POLICY // || operation == SET_CURRENT_POLICY) policy_manager->set_policy_overrides (policy_list, - override_type - ACE_ENV_ARG_PARAMETER); + override_type); } policy_list[0]->destroy (); } @@ -252,21 +243,20 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, { CORBA::PolicyTypeSeq types; policies = - policy_current->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); + policy_current->get_policy_overrides (types); } else if (operation == SAVE_MANAGER_POLICIES) { CORBA::PolicyTypeSeq types; policies = - policy_manager->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); + policy_manager->get_policy_overrides (types); } else if (operation == RESTORE_CURRENT_POLICIES) { if (policies.ptr () != 0) { policy_current->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); } } else // operation == RESTORE_MANAGER_POLICIES) @@ -274,23 +264,21 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, if (policies.ptr () != 0) { policy_manager->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore all exceptions } - ACE_ENDTRY; } int Manipulation::svc (void) { - ACE_TRY_NEW_ENV + try { #ifndef ACE_LACKS_LONGLONG_T ACE_RANDR_TYPE seed = @@ -300,18 +288,16 @@ Manipulation::svc (void) static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime().lo()); #endif CORBA::Object_var object = - this->orb_->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); for (int i = 0; i != this->niterations_; ++i) @@ -320,15 +306,12 @@ Manipulation::svc (void) this->perform_iteration (seed, policies, policy_manager.in (), - policy_current.in () - ACE_ENV_ARG_PARAMETER); + policy_current.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Manipulation: exception raised"); + ex._tao_print_exception ("Manipulation: exception raised"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index a3217d6afac..0a472efebf6 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -44,19 +44,17 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR((LM_ERROR, "ERROR, unexpected interception point called send_poll()\n")); - ACE_THROW(CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -69,13 +67,11 @@ 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); + 0); // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = - ri->get_request_service_context (::service_id - ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -83,7 +79,7 @@ Echo_Client_Request_Interceptor::send_request ( magic_cookie_len) != 0 ) { - ACE_THROW(CORBA::BAD_PARAM()); + throw CORBA::BAD_PARAM(); } Echo_Client_Request_Interceptor::request_count++; @@ -91,14 +87,12 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = - ri->get_request_service_context (::service_id - ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -106,7 +100,7 @@ Echo_Client_Request_Interceptor::receive_reply ( magic_cookie_len) != 0 ) { - ACE_THROW(CORBA::BAD_PARAM()); + throw CORBA::BAD_PARAM(); } Echo_Client_Request_Interceptor::reply_count++; @@ -114,15 +108,13 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = - ri->get_request_service_context (::service_id - ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -130,7 +122,7 @@ Echo_Client_Request_Interceptor::receive_other ( magic_cookie_len) != 0 ) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } Echo_Client_Request_Interceptor::other_count++; @@ -138,8 +130,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h index 0c529129019..2faafc7f5c5 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h @@ -32,26 +32,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); }; diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp index 533658d299d..f06678f33a8 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp @@ -17,21 +17,18 @@ Client_ORBInitializer::Client_ORBInitializer () void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_var interceptor( new Echo_Client_Request_Interceptor); - info->add_client_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h index 41c892cfb4f..c0425f701fa 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h @@ -20,12 +20,10 @@ class Client_ORBInitializer public: Client_ORBInitializer (); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp index 4a33052b676..89e5f53ca1a 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp @@ -15,8 +15,7 @@ Echo::Echo(CORBA::ORB_ptr orb) } char * -Echo::echo_operation(char const * the_input - ACE_ENV_ARG_DECL_NOT_USED) +Echo::echo_operation(char const * the_input) ACE_THROW_SPEC((CORBA::SystemException)) { return CORBA::string_dup(the_input); @@ -26,5 +25,5 @@ void Echo::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { - this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown(0); } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index 4a8b656ee82..3fce554f5bd 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -17,8 +17,7 @@ class Echo public: Echo(CORBA::ORB_ptr orb); - virtual char * echo_operation(char const * the_input - ACE_ENV_ARG_DECL) + virtual char * echo_operation(char const * the_input) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 88bd3501fc2..026b56bd3dc 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -19,16 +19,14 @@ Echo_Handler::Echo_Handler(void) } void -Echo_Handler::echo_operation (char const * - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Handler::echo_operation (char const *) ACE_THROW_SPEC((CORBA::SystemException)) { ++this->replies_; } void -Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *) ACE_THROW_SPEC((CORBA::SystemException)) { } @@ -40,8 +38,7 @@ Echo_Handler::shutdown (void) } void -Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) +Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *) 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 c3860e22125..e95865e1e9a 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -17,16 +17,13 @@ class Echo_Handler public: Echo_Handler(void); - virtual void echo_operation(char const * retval - ACE_ENV_ARG_DECL) + virtual void echo_operation(char const * retval) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void echo_operation_excep(::Messaging::ExceptionHolder * h - ACE_ENV_ARG_DECL) + virtual void echo_operation_excep(::Messaging::ExceptionHolder * h) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown_excep(::Messaging::ExceptionHolder * h - ACE_ENV_ARG_DECL) + virtual void shutdown_excep(::Messaging::ExceptionHolder * h) ACE_THROW_SPEC((CORBA::SystemException)); CORBA::ULong replies (void) const; diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 923d6db7f04..1d2ff768d21 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -36,8 +36,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -49,22 +48,21 @@ 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); + ri->get_request_service_context (id); if (sc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( magic_cookie, sc->context_data.get_buffer(), magic_cookie_len) != 0) { - ACE_THROW(CORBA::BAD_PARAM()); + throw CORBA::BAD_PARAM(); } } void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -72,16 +70,14 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -89,8 +85,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h index 1b81b12e20c..6d770bb6290 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h @@ -26,28 +26,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); }; diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index 6d8e323a9b8..f2d80031d8e 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -19,21 +19,18 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_var interceptor( new Echo_Server_Request_Interceptor); - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h index f02c068b74f..e65fe5085ce 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h @@ -20,12 +20,10 @@ class Server_ORBInitializer public: Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp index 4d4f046509d..450801a6190 100644 --- a/TAO/tests/Portable_Interceptors/AMI/client.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp @@ -43,37 +43,32 @@ parse_args (int argc, char *argv[]) return 0; } -static void test_synchronous (Test::Echo_ptr echo - ACE_ENV_ARG_DECL); +static void test_synchronous (Test::Echo_ptr echo); static void test_ami (CORBA::ORB_ptr orb, - Test::Echo_ptr echo - ACE_ENV_ARG_DECL); + Test::Echo_ptr echo); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { { PortableInterceptor::ORBInitializer_var initializer ( new Client_ORBInitializer); - PortableInterceptor::register_orb_initializer (initializer.in() - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in()); } CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,10 +79,10 @@ main (int argc, char *argv[]) root_poa->the_POAManager (); CORBA::Object_var tmp = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test::Echo_var echo = - Test::Echo::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Echo::_narrow (tmp.in ()); poa_manager->activate (); @@ -99,12 +94,10 @@ main (int argc, char *argv[]) 1); } - test_synchronous (echo.in () - ACE_ENV_ARG_PARAMETER); + test_synchronous (echo.in ()); test_ami (orb.in (), - echo.in () - ACE_ENV_ARG_PARAMETER); + echo.in ()); echo->shutdown (); @@ -137,20 +130,17 @@ main (int argc, char *argv[]) "ERROR: No response handled ")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return exit_status; } static void -test_synchronous (Test::Echo_ptr echo - ACE_ENV_ARG_DECL) +test_synchronous (Test::Echo_ptr echo) { unsigned long initial_request_count = Echo_Client_Request_Interceptor::request_count; @@ -160,8 +150,7 @@ test_synchronous (Test::Echo_ptr echo for (unsigned long i = 0; i != ITERATIONS; ++i) { CORBA::String_var s = - echo->echo_operation ("dummy message" - ACE_ENV_ARG_PARAMETER); + echo->echo_operation ("dummy message"); } unsigned long total_request_count = @@ -194,8 +183,7 @@ test_synchronous (Test::Echo_ptr echo static void test_ami (CORBA::ORB_ptr orb, - Test::Echo_ptr echo - ACE_ENV_ARG_DECL) + Test::Echo_ptr echo) { Test::AMI_EchoHandler_var echo_handler; Echo_Handler * echo_handler_impl = new Echo_Handler; @@ -214,8 +202,7 @@ test_ami (CORBA::ORB_ptr orb, { echo->sendc_echo_operation ( echo_handler.in (), - "dummy message" - ACE_ENV_ARG_PARAMETER); + "dummy message"); } unsigned long total_request_count = @@ -269,31 +256,28 @@ test_ami (CORBA::ORB_ptr orb, #if 0 static void wait_for_exception (CORBA::ORB_ptr orb, - Test::Echo_ptr echo - ACE_ENV_ARG_DECL) + Test::Echo_ptr echo) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); bool exception_detected = false; while(!exception_detected) { - ACE_TRY + try { CORBA::String_var dummy = - echo->echo_operation ("foo" - ACE_ENV_ARG_PARAMETER); + echo->echo_operation ("foo"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { exception_detected = true; } - ACE_ENDTRY; } tv = ACE_Time_Value (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } #endif /*if 0*/ diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 9d32157f46e..220549ac69a 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -43,23 +43,22 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { { PortableInterceptor::ORBInitializer_var initializer( new Server_ORBInitializer); - PortableInterceptor::register_orb_initializer(initializer.in() - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer(initializer.in()); } CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,7 +81,7 @@ main (int argc, char *argv[]) echo_impl->_this (); CORBA::String_var ior = - orb->object_to_string (echo.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (echo.in ()); // Output the IOR to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -100,17 +99,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 2e1f0fc57dc..780cad1d12a 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -181,7 +181,7 @@ public: ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Could not resolve PICurrent object.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ServerRequestInterceptor_var interceptor (new ReplicaController (pi_current.in ())); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 841c4b7a76e..b982a6ee210 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -16,16 +16,14 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -66,6 +64,5 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; - info->add_client_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h index f26c625ffbe..1a0b10ba5cb 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index d39ee932251..3b021b51eb8 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -18,16 +18,14 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,6 +66,5 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h index 599301a17d9..1907dcab0db 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Server_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index e1b14bb4e51..bf51c2f3bf0 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -51,8 +51,7 @@ parse_args (int argc, char *argv[]) void -run_test (Test_Interceptors::Secure_Vault_ptr server - ACE_ENV_ARG_DECL) +run_test (Test_Interceptors::Secure_Vault_ptr server) { int i = 0; const char user[] = "root"; @@ -86,7 +85,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server marker.dump_stats ("Ready method ", gsf, 1); - ACE_TRY + try { marker.accumulate_into (throughput, 2); throughput_base = ACE_OS::gethrtime (); @@ -96,7 +95,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->authenticate (user ACE_ENV_ARG_PARAMETER); + server->authenticate (user); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -111,11 +110,10 @@ run_test (Test_Interceptors::Secure_Vault_ptr server } marker.dump_stats ("Authenticate method ", gsf, 2); } - ACE_CATCH (Test_Interceptors::Invalid, userex) + catch (const Test_Interceptors::Invalid& userex) { ACE_DEBUG ((LM_DEBUG, "Invalid user\n")); } - ACE_ENDTRY; Test_Interceptors::Secure_Vault::Record record; record.check_num = 1; @@ -131,8 +129,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_hrtime_t latency_base = ACE_OS::gethrtime (); server->update_records (id, - record - ACE_ENV_ARG_PARAMETER); + record); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -177,7 +174,7 @@ main (int argc, char *argv[]) int interceptor_type; get_interceptor_type (argc, argv, interceptor_type); - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -187,21 +184,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Secure_Vault::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -216,17 +211,15 @@ main (int argc, char *argv[]) // This test is useful for benchmarking the differences when // the same method is intercepted by different interceptors // wanting to achieve different functionality. - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index dd6919fcd4a..93ed136976e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -38,8 +38,7 @@ Vault_Client_Request_Interceptor::destroy (void) void Vault_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -47,8 +46,7 @@ Vault_Client_Request_Interceptor::send_poll ( void Vault_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -71,7 +69,7 @@ Vault_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); + ri->add_request_service_context (sc, 0); } if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -90,8 +88,7 @@ Vault_Client_Request_Interceptor::send_request ( void Vault_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -108,8 +105,7 @@ Vault_Client_Request_Interceptor::receive_reply ( void Vault_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -118,8 +114,7 @@ Vault_Client_Request_Interceptor::receive_other ( void Vault_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -153,24 +148,21 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep } char * -Vault_Client_Request_Context_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Context_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Context_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Context_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Context_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -178,8 +170,7 @@ Vault_Client_Request_Context_Interceptor::send_poll ( void Vault_Client_Request_Context_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -200,13 +191,12 @@ Vault_Client_Request_Context_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); + ri->add_request_service_context (sc, 0); } void Vault_Client_Request_Context_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -215,8 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_other ( void Vault_Client_Request_Context_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -224,8 +213,7 @@ Vault_Client_Request_Context_Interceptor::receive_reply ( void Vault_Client_Request_Context_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -259,24 +247,21 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep } char * -Vault_Client_Request_Dynamic_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Dynamic_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Dynamic_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Dynamic_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Dynamic_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -284,8 +269,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll ( void Vault_Client_Request_Dynamic_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -319,8 +303,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( void Vault_Client_Request_Dynamic_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -347,8 +330,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( void Vault_Client_Request_Dynamic_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -357,8 +339,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other ( void Vault_Client_Request_Dynamic_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -399,16 +380,14 @@ Vault_Client_Request_NOOP_Interceptor::name (void) } void -Vault_Client_Request_NOOP_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_NOOP_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_NOOP_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -416,8 +395,7 @@ Vault_Client_Request_NOOP_Interceptor::send_poll ( void Vault_Client_Request_NOOP_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -426,8 +404,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request ( void Vault_Client_Request_NOOP_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -436,8 +413,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_other ( void Vault_Client_Request_NOOP_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -445,8 +421,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply ( void Vault_Client_Request_NOOP_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index 7fa620e29d5..bdc6760fe89 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -83,26 +78,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -128,26 +118,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -173,26 +158,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index 32cc8cdce8f..22878410b94 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -45,7 +45,7 @@ main (int argc, char *argv[]) int interceptor_type; get_interceptor_type (argc, argv, interceptor_type); - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -55,24 +55,23 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -82,19 +81,16 @@ main (int argc, char *argv[]) Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Secure_Vault::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Secure_Vault: <%s>\n", @@ -117,15 +113,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index 8bb4a1e9aec..8cc0f504334 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -38,8 +38,7 @@ Vault_Server_Request_Interceptor::destroy (void) void Vault_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -48,8 +47,7 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts ( void Vault_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -60,13 +58,13 @@ Vault_Server_Request_Interceptor::receive_request ( { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); if (ACE_OS::strcmp (buf, "root123") != 0) - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -85,8 +83,7 @@ Vault_Server_Request_Interceptor::receive_request ( void Vault_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -103,8 +100,7 @@ Vault_Server_Request_Interceptor::send_reply ( void Vault_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -113,8 +109,7 @@ Vault_Server_Request_Interceptor::send_exception ( void Vault_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -134,24 +129,21 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep } char * -Vault_Server_Request_Context_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Context_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Context_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Context_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -160,26 +152,24 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Context_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); if (ACE_OS::strcmp (buf, "root123") !=0) - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } void Vault_Server_Request_Context_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -187,8 +177,7 @@ Vault_Server_Request_Context_Interceptor::send_reply ( void Vault_Server_Request_Context_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -196,8 +185,7 @@ Vault_Server_Request_Context_Interceptor::send_exception ( void Vault_Server_Request_Context_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -216,24 +204,21 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep } char * -Vault_Server_Request_Dynamic_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Dynamic_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Dynamic_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Dynamic_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Dynamic_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -267,8 +252,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( void Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -277,8 +261,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Dynamic_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -303,8 +286,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( void Vault_Server_Request_Dynamic_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -312,8 +294,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception ( void Vault_Server_Request_Dynamic_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -339,16 +320,14 @@ Vault_Server_Request_NOOP_Interceptor::name (void) } void -Vault_Server_Request_NOOP_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_NOOP_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_NOOP_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -356,8 +335,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request ( void Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -366,8 +344,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( void Vault_Server_Request_NOOP_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -375,8 +352,7 @@ Vault_Server_Request_NOOP_Interceptor::send_reply ( void Vault_Server_Request_NOOP_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -384,8 +360,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception ( void Vault_Server_Request_NOOP_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 3f4c6cf9a3f..3d8481368d5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -38,28 +38,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -85,28 +80,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -132,28 +122,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -179,28 +164,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 486c503d03c..bc2945f2fed 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -20,20 +20,18 @@ Secure_Vault_i::ready (void) } void -Secure_Vault_i::authenticate (const char * user - ACE_ENV_ARG_DECL) +Secure_Vault_i::authenticate (const char * user) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)) { if (ACE_OS::strcmp (user, "root") != 0) - ACE_THROW (Test_Interceptors::Invalid ()); + throw Test_Interceptors::Invalid (); } CORBA::Long Secure_Vault_i::update_records (CORBA::Long, - const Test_Interceptors::Secure_Vault::Record & - ACE_ENV_ARG_DECL_NOT_USED) + const Test_Interceptors::Secure_Vault::Record &) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; @@ -43,5 +41,5 @@ void Secure_Vault_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index e6b182888f5..9516f9babe1 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -30,15 +30,13 @@ public: virtual CORBA::Short ready (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void authenticate (const char * user - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void authenticate (const char * user) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)); // Passwd sent in the service context list virtual CORBA::Long update_records (CORBA::Long id, - const Test_Interceptors::Secure_Vault::Record & val - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const Test_Interceptors::Secure_Vault::Record & val) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index 4ce9d465ca0..81394e0fdbd 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -14,16 +14,14 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41,7 +39,6 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h index 569419fb346..c232ee05e1a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index 030ab3b4969..379d2a83186 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -15,16 +15,14 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // Install the Echo server request interceptor @@ -35,8 +33,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h index 1cd2c636db6..6db28e5db35 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h @@ -32,12 +32,10 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the created server request interceptor. Only valid after diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index f834c28a8f0..ec776011160 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -36,11 +36,10 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); @@ -48,32 +47,29 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); - ACE_TRY + try { server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -83,20 +79,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -106,17 +101,15 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client:"); + ex._tao_print_exception ("Caught exception in client:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index 01b87c1d099..738d36414af 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -43,8 +43,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -52,8 +51,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -61,8 +59,7 @@ Echo_Client_Request_Interceptor::send_request ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = @@ -72,7 +69,7 @@ Echo_Client_Request_Interceptor::send_request ( ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -83,16 +80,15 @@ Echo_Client_Request_Interceptor::send_request ( send_request_count++; - ACE_TRY_NEW_ENV + try { - ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); } - ACE_CATCH (CORBA::BAD_PARAM, error) + catch (const CORBA::BAD_PARAM& error) { // This is supposed to happen exception_count++; } - ACE_ENDTRY; if (send_request_count == 1) { @@ -115,11 +111,11 @@ 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); + ri->add_request_service_context (sc, 0); // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -154,11 +150,11 @@ 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); + ri->add_request_service_context (sc, 0); // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -181,8 +177,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -190,8 +185,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = @@ -201,7 +195,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -213,7 +207,7 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -230,7 +224,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -249,8 +243,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -266,7 +259,7 @@ Echo_Client_Request_Interceptor::receive_other ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.receive_other from " @@ -277,7 +270,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -294,8 +287,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -304,8 +296,7 @@ Echo_Client_Request_Interceptor::receive_exception ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -313,7 +304,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -325,7 +316,7 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -342,7 +333,7 @@ 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); + ri->get_request_service_context (::service_id); 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 5ee9a220c42..705bce07974 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp index 7ff16a1cdaa..20870c8b227 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { Server_ORBInitializer * temp_initializer = 0; @@ -50,15 +50,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); // Now we can create the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -66,7 +65,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -79,19 +78,16 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); // Create a second object to receive forwarded requests Visual_i forward_server_impl (orb.in ()); PortableServer::ObjectId_var forward_id = - root_poa->activate_object (&forward_server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&forward_server_impl); CORBA::Object_var forward_test_obj = - root_poa->id_to_reference (forward_id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (forward_id.in ()); Echo_Server_Request_Interceptor * server_interceptor = temp_initializer->server_interceptor (); @@ -102,19 +98,16 @@ main (int argc, char *argv[]) "server request interceptor.\n"), -1); - server_interceptor->forward_reference (forward_test_obj.in () - ACE_ENV_ARG_PARAMETER); + server_interceptor->forward_reference (forward_test_obj.in ()); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -137,15 +130,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in server:"); + ex._tao_print_exception ("Caught exception in server:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index ffb42ec8d1c..f6e6374bcb4 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -33,16 +33,15 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } void -Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location - ACE_ENV_ARG_DECL) +Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward_location)) - ACE_THROW (CORBA::INV_OBJREF ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - EINVAL), - CORBA::COMPLETED_NO)); + throw CORBA::INV_OBJREF ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + EINVAL), + CORBA::COMPLETED_NO); this->forward_location_ = CORBA::Object::_duplicate (forward_location); } @@ -61,8 +60,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -84,7 +82,7 @@ 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); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -94,7 +92,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( if (ACE_OS::strcmp (buf, request_msg) == 0) { ACE_DEBUG ((LM_DEBUG, "Sending LOCATION_FORWARD\n")); - ACE_THROW (PortableInterceptor::ForwardRequest (this->forward_location_)); + throw PortableInterceptor::ForwardRequest (this->forward_location_); } else if (ACE_OS::strcmp (buf, forward_msg) == 0) { @@ -111,7 +109,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( scc.context_data.replace (string_len, string_len, buff, 1); // Add this context to the service context list. - ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); + ri->add_reply_service_context (scc, 0); } else { @@ -126,8 +124,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -136,8 +133,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -150,7 +146,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -167,7 +163,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -184,8 +180,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -199,7 +194,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -216,7 +211,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -233,8 +228,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -247,7 +241,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -270,5 +264,5 @@ Echo_Server_Request_Interceptor::send_other ( CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) - ACE_THROW (CORBA::INTERNAL ()); + 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 f23ef1915ca..064060a82ed 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h @@ -33,8 +33,7 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - void forward_reference (CORBA::Object_ptr forward_location - ACE_ENV_ARG_DECL) + void forward_reference (CORBA::Object_ptr forward_location) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * name (void) @@ -44,28 +43,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index a7839f0a2cd..925f856c0b5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -13,8 +13,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) } void -Visual_i::normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -33,7 +32,7 @@ Visual_i::user (void) Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -41,12 +40,12 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index fbe117ea5d2..cda32b963d9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -28,8 +28,7 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); void nothing (void) diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp index db9719164d0..f34df67521f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp @@ -15,23 +15,21 @@ Client_ORBInitializer::Client_ORBInitializer (void) : void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { pre_init_called = true; - ACE_THROW (CORBA::NO_MEMORY ()); + throw CORBA::NO_MEMORY (); } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { post_init_called = true; - ACE_THROW (CORBA::NO_MEMORY ()); + throw CORBA::NO_MEMORY (); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h index 9e1d7b79009..7a957b49449 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); bool pre_init_called; diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp index 9fd546f0552..939cd33831f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -27,30 +27,26 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer_var2 = initializer2; - ACE_TRY_NEW_ENV + try { - PortableInterceptor::register_orb_initializer (initializer_var1.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer_var1.in ()); - PortableInterceptor::register_orb_initializer (initializer_var2.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer_var2.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); } - ACE_CATCH (CORBA::NO_MEMORY, ex) + catch (const CORBA::NO_MEMORY& ex) { // Initializer1 throws this exception and we should get it here caught_exception = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client:"); + ex._tao_print_exception ("Caught exception in client:"); return 1; } - ACE_ENDTRY; // Only the pre init for initalizer 1 must be called, other initializers // shouldn't be caught 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 5d8a1d77a55..488e02da7a1 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -14,16 +14,14 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::SlotId slot_id = info->allocate_slot_id (); @@ -39,8 +37,7 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); ACE_UNUSED_ARG (slot_id); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h index 569419fb346..c232ee05e1a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; 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 87b8b09a27f..b3b7e6c0aff 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -16,16 +16,14 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // allocate a slot @@ -40,8 +38,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h index 1cd2c636db6..6db28e5db35 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h @@ -32,12 +32,10 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the created server request interceptor. Only valid after diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index cd8cbf79b2e..e1677d80510 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -40,15 +40,14 @@ static ACE_THR_FUNC_RETURN run_test(void* pData) { Test_Interceptors::Visual_ptr server = static_cast<Test_Interceptors::Visual_ptr>(pData); - ACE_TRY + try { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Exception thrown in run_test()\n"); + ex._tao_print_exception ("Exception thrown in run_test()\n"); } - ACE_ENDTRY; return (ACE_THR_FUNC_RETURN)0; } @@ -56,7 +55,7 @@ static ACE_THR_FUNC_RETURN run_test(void* pData) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -66,20 +65,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -105,14 +103,12 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client:"); + ex._tao_print_exception ("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 a1e13028d77..1eeb8900fbf 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -38,8 +38,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -47,8 +46,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -71,13 +69,12 @@ 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); + ri->add_request_service_context (sc, 0); } void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = @@ -91,8 +88,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -105,8 +101,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 d1a4ed1b491..422b2b85d2b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 93ebd9098d9..d591eae147a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // create initializer Server_ORBInitializer * temp_initializer = 0; @@ -50,14 +50,13 @@ main (int argc, char *argv[]) -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); // Now create an ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -65,7 +64,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -78,19 +77,16 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -113,15 +109,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in server:"); + ex._tao_print_exception ("Caught exception in server:"); return 1; } - ACE_ENDTRY; return 0; } 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 1edf05d2a24..3fab15a987f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -34,8 +34,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -55,7 +54,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // retrieve the context IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -76,17 +75,17 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( CORBA::Any data; data <<= buf; - ACE_TRY + try { ri->set_slot (slotId, data); ACE_DEBUG ((LM_DEBUG, "receive_request_service_contexts filled Slot %d\n",(int)slotId)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Exception thrown in receive_request_service_contexts()\n"); - ACE_TRY_THROW (CORBA::INTERNAL ()); + ex._tao_print_exception ( + "Exception thrown in receive_request_service_contexts()\n"); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; } } @@ -94,8 +93,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -104,8 +102,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -113,8 +110,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -123,8 +119,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 938dfc12486..a557c28d97e 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -38,28 +38,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); 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 1dd810a18be..66cf0bea079 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -16,8 +16,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) } void -Visual_i::normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -34,16 +33,16 @@ Visual_i::normal (CORBA::Long arg } CORBA::Any_var retrieved_any; - ACE_TRY + try { retrieved_any = pi_current->get_slot(slotId); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Visual_i::normal : get_slot() threw Exception\n"); + ex._tao_print_exception ( + "Visual_i::normal : get_slot() threw Exception\n"); throw; } - ACE_ENDTRY; const char *str = 0; if (! (retrieved_any.in() >>= str) ) @@ -61,5 +60,5 @@ void Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 14457ef6443..335729c2d2c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -28,8 +28,7 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index f0cd31d306f..12802f28aea 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -21,14 +21,14 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + corb_->string_to_object (input_); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -38,17 +38,15 @@ Client_Task::svc (void) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client task:"); + ex._tao_print_exception ("Exception caught in client task:"); return 1; } - ACE_ENDTRY; return 0; @@ -56,34 +54,29 @@ Client_Task::svc (void) void -Client_Task::run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +Client_Task::run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); CORBA::Long one = 1, two = 1; (void) server->calculate (one, - two - ACE_ENV_ARG_PARAMETER); + two); - ACE_TRY + try { (void) server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h index def1f6d2bb4..c986c8b63db 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h @@ -27,8 +27,7 @@ public: /// Thread entry point int svc (void); - void run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL); + void run_test (Test_Interceptors::Visual_ptr server); private: const char *input_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 42262eb0f72..c56bb23e027 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -48,8 +48,7 @@ main (int argc, char *argv[]) server_orb.set ("server_orb"); client_orb.set ("client_orb"); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -60,15 +59,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -90,8 +87,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -125,10 +121,9 @@ main (int argc, char *argv[]) " properly\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } 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 bb9107f608d..40b23b8c661 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp @@ -9,16 +9,14 @@ void Echo_Collocated_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Collocated_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = @@ -37,8 +35,7 @@ Echo_Collocated_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) { @@ -53,8 +50,7 @@ Echo_Collocated_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); } else { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h index 7a18eb9b37a..4865ea54fbe 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h @@ -29,12 +29,10 @@ class Echo_Collocated_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index 32cca3aa9dc..1d1ef6bcbc8 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -26,11 +26,11 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + sorb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,7 +38,7 @@ Server_Task::svc (void) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -49,19 +49,16 @@ Server_Task::svc (void) ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); PortableServer::ObjectId_var id = - root_poa->activate_object (server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -85,15 +82,13 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server task:"); + ex._tao_print_exception ("Exception caught in server task:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index e60a822c7a6..6a3f8ba9884 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -41,7 +41,6 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -50,8 +49,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -91,8 +89,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -110,8 +107,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { client_interceptor_check_++; @@ -163,8 +159,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -209,8 +204,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -218,8 +212,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -260,8 +253,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { ++server_interceptor_check_; @@ -311,8 +303,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -340,8 +331,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 133ed9e49be..2655dcf2fde 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -41,31 +41,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -94,30 +89,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 38c49820914..b95b285602e 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -12,8 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) // ctor void -Visual_i::normal (CORBA::Long - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -21,8 +20,7 @@ Visual_i::normal (CORBA::Long CORBA::Long Visual_i::calculate (CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -34,7 +32,7 @@ Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -42,7 +40,7 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index ab24946aa27..841d3ef41df 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -27,14 +27,12 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)); void user (void) 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 c1459691f7f..aad90e7680a 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 @@ -20,13 +20,13 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var obj = - this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + this->corb_->string_to_object (input_); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) { @@ -36,50 +36,44 @@ Client_Task::svc (void) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); this->corb_->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client task:"); + ex._tao_print_exception ("Exception caught in client task:"); return 1; } - ACE_ENDTRY; return 0; } void -Client_Task::run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +Client_Task::run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); server->nothing (); - ACE_TRY + try { server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h index 080096a550b..9448c093314 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h @@ -27,8 +27,7 @@ public: /// Thread entry point int svc (void); - void run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL); + void run_test (Test_Interceptors::Visual_ptr server); private: const char *input_; 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 10431febe8b..be0762f3add 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 @@ -10,16 +10,14 @@ Collocated_ORBInitializer::Collocated_ORBInitializer (void) void Collocated_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Collocated_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,8 +37,7 @@ Collocated_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) @@ -56,8 +53,7 @@ Collocated_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); } else diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h index 42b2ea926a4..94f2002627f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h @@ -28,12 +28,10 @@ public: /// Constructor Collocated_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; 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 51d75958ed9..b7a287e6f8d 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 @@ -50,8 +50,7 @@ main (int argc, char *argv[]) server_orb.set ("server_orb"); client_orb.set ("client_orb"); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -61,16 +60,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; @@ -93,8 +90,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -109,11 +105,10 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions.. } - ACE_ENDTRY; return 0; } 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 68a1d93a219..948f11293bd 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 @@ -20,15 +20,13 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - this->sorb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->sorb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -45,19 +43,16 @@ Server_Task::svc (void) PortableServer::ServantBase_var server_impl = vi; PortableServer::ObjectId_var id = - root_poa->activate_object (server_impl.in() - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (server_impl.in()); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + sorb_->object_to_string (server.in ()); // If the ior_output_file exists, output the ior to it if (output_ != 0) @@ -81,17 +76,15 @@ Server_Task::svc (void) 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); + root_poa->destroy (1, 1); this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server task:"); + ex._tao_print_exception ("Exception caught in server task:"); return 1; } - ACE_ENDTRY; return 0; } 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 d0d5cbf3137..1cd6e4b132e 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -39,8 +39,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -48,8 +47,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -58,8 +56,7 @@ Echo_Client_Request_Interceptor::send_request ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = @@ -68,7 +65,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -89,11 +86,11 @@ 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); + ri->add_request_service_context (sc, 0); // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -112,8 +109,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -121,8 +117,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = @@ -132,7 +127,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -140,13 +135,12 @@ Echo_Client_Request_Interceptor::receive_reply ( this->myname_, operation.in ())); - ACE_TRY + try { // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id - ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -163,8 +157,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -178,18 +171,16 @@ Echo_Client_Request_Interceptor::receive_reply ( buf2)); } } - ACE_CATCH (CORBA::BAD_PARAM, ex) + catch (const CORBA::BAD_PARAM& ex) { ACE_ERROR ((LM_ERROR, "ERROR: Service Context Error \n")); } - ACE_ENDTRY; } void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -200,8 +191,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -209,8 +199,7 @@ Echo_Client_Request_Interceptor::receive_exception ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -218,7 +207,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -226,13 +215,12 @@ Echo_Client_Request_Interceptor::receive_exception ( this->myname_, operation.in ())); - ACE_TRY + try { // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id - ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -249,8 +237,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -264,12 +251,11 @@ Echo_Client_Request_Interceptor::receive_exception ( buf2)); } } - ACE_CATCH (CORBA::BAD_PARAM, ex) + catch (const CORBA::BAD_PARAM& ex) { ACE_ERROR ((LM_ERROR, "ERROR: Service Context Error \n")); } - ACE_ENDTRY; } Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) @@ -297,8 +283,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -312,7 +297,7 @@ 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); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -341,14 +326,13 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( scc.context_data.replace (string_len, string_len, buff, 1); // Add this context to the service context list. - ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); + ri->add_reply_service_context (scc, 0); } void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -357,8 +341,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -371,7 +354,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -388,7 +371,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -405,8 +388,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -420,7 +402,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -437,7 +419,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -454,8 +436,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 961ce20f095..1f7697c2b2c 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h @@ -37,26 +37,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -89,28 +84,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); 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 deeae26c4eb..1698c9deb89 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 @@ -13,8 +13,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) } void -Visual_i::normal (CORBA::Long - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -33,7 +32,7 @@ Visual_i::user (void) Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -41,7 +40,7 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void @@ -50,5 +49,5 @@ Visual_i::shutdown (void) { // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 8859d26f954..3462b7381bc 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 @@ -26,8 +26,7 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); void nothing (void) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2f92cf250c0..8ac0bdf1e27 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -12,16 +12,14 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$") void Echo_Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36,8 +34,7 @@ Echo_Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index cd09fcce9bd..ed54836594f 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -31,12 +31,10 @@ class Echo_Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index dfec81cec41..6644b46f786 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -12,16 +12,14 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$") void Echo_Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36,8 +34,7 @@ Echo_Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index 26b483304c7..260321c8c22 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -31,12 +31,10 @@ class Echo_Server_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index 68a5a30416e..4edea513319 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -40,19 +40,16 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +run_test (Test_Interceptors::Visual_ptr server) { CORBA::String_var msg; server->normal (10, - msg.out () - ACE_ENV_ARG_PARAMETER); + msg.out ()); CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, - two - ACE_ENV_ARG_PARAMETER); + two); ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", @@ -68,32 +65,29 @@ run_test (Test_Interceptors::Visual_ptr server v->flag, v->message.in ())); - ACE_TRY + try { server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -105,21 +99,20 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -129,17 +122,15 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 88b6fe3dba5..75d06c89160 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -39,7 +39,6 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -48,8 +47,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -116,8 +113,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -220,8 +216,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index b351476113d..4c46a2ca34e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -37,33 +37,28 @@ public: virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 7d2035f72e5..b8cbed4702f 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -53,15 +53,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +68,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -82,19 +81,16 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -115,15 +111,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 232d5be21c4..07796958db9 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -38,8 +38,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -47,8 +46,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -85,8 +83,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -135,8 +132,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -163,8 +159,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index d838e0abcd8..c6965925c02 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -36,30 +36,25 @@ public: virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 5abcc564b62..d13cfebd6c9 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -14,8 +14,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg, - CORBA::String_out msg - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::String_out msg) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -24,8 +23,7 @@ Visual_i::normal (CORBA::Long arg, CORBA::Long Visual_i::calculate (CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -55,7 +53,7 @@ Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -63,7 +61,7 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index b1cb9244297..6999c24bd2b 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -22,17 +22,14 @@ public: Visual_i (CORBA::ORB_ptr orb); virtual CORBA::Long calculate (CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)); void normal (CORBA::Long arg, - CORBA::String_out msg - ACE_ENV_ARG_DECL) + CORBA::String_out msg) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Test_Interceptors::Visual::VarLenStruct * the_structure ( - ACE_ENV_SINGLE_ARG_DECL) + virtual Test_Interceptors::Visual::VarLenStruct * the_structure () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void user (void) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 812695fba5f..3502e13a75d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -16,16 +16,14 @@ ACE_RCSID (ForwardRequest, void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); @@ -57,8 +55,7 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h index 10386969df0..4ed3c09f374 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h @@ -42,12 +42,10 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index b2ab0ceba8c..c652aac506f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -20,8 +20,7 @@ Client_Request_Interceptor::Client_Request_Interceptor ( } char * -Client_Request_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); @@ -35,8 +34,7 @@ Client_Request_Interceptor::destroy (void) void Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -58,17 +56,14 @@ Client_Request_Interceptor::send_request ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::Object_var forward = - this->orb_->string_to_object (this->forward_str_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->forward_str_.in ()); CORBA::String_var forward_str = - this->orb_->object_to_string (forward.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (forward.in ()); ACE_DEBUG ((LM_DEBUG, "CLIENT (%P|%t) Request %d will be forwarded " @@ -77,30 +72,27 @@ Client_Request_Interceptor::send_request ( this->request_count_)); // Notice that this is not a permanent forward. - ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ())); + throw PortableInterceptor::ForwardRequest (forward.in ()); } } void Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -108,8 +100,7 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -137,7 +128,7 @@ Client_Request_Interceptor::receive_other ( CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); ACE_DEBUG ((LM_DEBUG, "CLIENT (%P|%t) Received LOCATION_FORWARD reply.\n")); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index f285ebbb668..5473606c20a 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -72,30 +72,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index cb1393d02a5..fefe4eb0c3d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -19,16 +19,14 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; @@ -43,8 +41,7 @@ Server_ORBInitializer::post_init ( this->server_interceptor_ = interceptor; - info->add_server_request_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor); } PortableInterceptor::ServerRequestInterceptor_ptr diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index 90be3b9571a..289899370ec 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h @@ -48,12 +48,10 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the created server request interceptor. Only valid after diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 0ad95fa4a28..6f113992989 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -24,16 +24,15 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) void Server_Request_Interceptor::forward_references ( CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2 - ACE_ENV_ARG_DECL) + CORBA::Object_ptr obj2) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) - ACE_THROW (CORBA::INV_OBJREF ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - EINVAL), - CORBA::COMPLETED_NO)); + throw CORBA::INV_OBJREF ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + EINVAL), + CORBA::COMPLETED_NO); this->obj_[0] = CORBA::Object::_duplicate (obj1); this->obj_[1] = CORBA::Object::_duplicate (obj2); @@ -56,8 +55,7 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -86,14 +84,13 @@ Server_Request_Interceptor::receive_request_service_contexts ( "receive_request_service_contexts().\n", this->request_count_)); - ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[0])); + throw PortableInterceptor::ForwardRequest (this->obj_[0]); } } void Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -124,22 +121,20 @@ Server_Request_Interceptor::receive_request ( // "request_count_ - 1" is used above since there was a location // forward. - ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[1])); + throw PortableInterceptor::ForwardRequest (this->obj_[1]); } } void Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -147,8 +142,7 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -167,5 +161,5 @@ Server_Request_Interceptor::send_other ( CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) - ACE_THROW (CORBA::INTERNAL ()); + 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 46264e65e30..299f1a5bc62 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -65,8 +65,7 @@ public: /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Object_ptr obj2) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -86,31 +85,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index 111fed0e3c4..b1e1b4a439f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -52,8 +52,7 @@ main (int argc, char *argv[]) { int status = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -65,14 +64,12 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); + "Client ORB"); if (::parse_args (argc, argv) != 0) return -1; @@ -81,10 +78,10 @@ main (int argc, char *argv[]) // IOR occurs during the various interceptions executed during // this test. CORBA::Object_var object = - orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior1); ForwardRequestTest::test_var server = - ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + ForwardRequestTest::test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -140,13 +137,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; if (status != -1) ACE_DEBUG ((LM_INFO, diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 1864fcda68d..f38e3a462f5 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -60,8 +60,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 Server_ORBInitializer *temp_initializer = 0; @@ -71,15 +70,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,7 +85,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -103,19 +101,16 @@ main (int argc, char *argv[]) PortableServer::POA_var first_poa = root_poa->create_POA ("first POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::ObjectId_var oid1 = - first_poa->activate_object (&servant1 - ACE_ENV_ARG_PARAMETER); + first_poa->activate_object (&servant1); CORBA::Object_var obj1 = - first_poa->servant_to_reference (&servant1 - ACE_ENV_ARG_PARAMETER); + first_poa->servant_to_reference (&servant1); CORBA::String_var ior1 = - orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj1.in ()); ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 1: <%s>\n", @@ -127,19 +122,16 @@ main (int argc, char *argv[]) PortableServer::POA_var second_poa = root_poa->create_POA ("second POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::ObjectId_var oid2 = - second_poa->activate_object (&servant2 - ACE_ENV_ARG_PARAMETER); + second_poa->activate_object (&servant2); CORBA::Object_var obj2 = - second_poa->servant_to_reference (&servant2 - ACE_ENV_ARG_PARAMETER); + second_poa->servant_to_reference (&servant2); CORBA::String_var ior2 = - orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj2.in ()); ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 2: <%s>\n", @@ -154,7 +146,7 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( - server_interceptor.in () ACE_ENV_ARG_PARAMETER); + server_interceptor.in ()); if (CORBA::is_nil (interceptor.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -163,8 +155,7 @@ main (int argc, char *argv[]) -1); interceptor->forward_references (obj1.in (), - obj2.in () - ACE_ENV_ARG_PARAMETER); + obj2.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ // Write each IOR to a file. @@ -193,19 +184,17 @@ main (int argc, char *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index 122324ab774..283aae38b3c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -31,5 +31,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index 6d44d1f9fa9..afe0aa159a9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -17,8 +17,7 @@ FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor ( } char * -FOO_ClientRequestInterceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_ClientRequestInterceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_ClientRequestInterceptor"); @@ -32,8 +31,7 @@ FOO_ClientRequestInterceptor::destroy (void) void FOO_ClientRequestInterceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -41,8 +39,7 @@ FOO_ClientRequestInterceptor::send_request ( // into the IOR by the FOO_IORInterceptor is actually in the IOR // profile. IOP::TaggedComponent_var component = - ri->get_effective_component (FOO::COMPONENT_ID - ACE_ENV_ARG_PARAMETER); + ri->get_effective_component (FOO::COMPONENT_ID); // The correct tagged component appears to exist. Display the // contents of the component data, which should be a NULL terminated @@ -56,7 +53,7 @@ FOO_ClientRequestInterceptor::send_request ( ACE_ERROR ((LM_ERROR, "Internal test error. Empty tagged component.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } CORBA::ULong maximum = component->component_data.maximum (); @@ -69,8 +66,7 @@ FOO_ClientRequestInterceptor::send_request ( // Extract the data from the octet sequence. CORBA::Any_var decoded_data = this->codec_->decode_value (data, - CORBA::_tc_string - ACE_ENV_ARG_PARAMETER); + CORBA::_tc_string); const char * name = 0; @@ -80,7 +76,7 @@ FOO_ClientRequestInterceptor::send_request ( "ERROR: Unable to extract tagged component " "data from Any.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, @@ -91,24 +87,21 @@ FOO_ClientRequestInterceptor::send_request ( void FOO_ClientRequestInterceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_ClientRequestInterceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_ClientRequestInterceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -116,8 +109,7 @@ FOO_ClientRequestInterceptor::receive_exception ( void FOO_ClientRequestInterceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index 74b07c85d0f..8af1cbf2dcb 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -67,30 +67,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index b759201cbc9..733cbfe45b3 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -12,15 +12,14 @@ ACE_RCSID (IORInterceptor, void FOO_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = @@ -35,8 +34,7 @@ FOO_Client_ORBInitializer::post_init ( // Obtain the CDR encapsulation Codec. IOP::Codec_var codec = - codec_factory->create_codec (encoding - ACE_ENV_ARG_PARAMETER); + codec_factory->create_codec (encoding); PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -50,6 +48,5 @@ FOO_Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; - info->add_client_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index a047658b5a8..4b69449d50b 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -54,14 +54,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index ebb1c1342cc..f776640a8e6 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -28,8 +28,7 @@ FOO_IORInterceptor::destroy (void) void FOO_IORInterceptor::establish_components ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // According to the Portable Interceptors specification, @@ -44,8 +43,7 @@ FOO_IORInterceptor::establish_components ( data <<= name.in (); CORBA::OctetSeq_var encoded_data = - this->codec_->encode_value (data - ACE_ENV_ARG_PARAMETER); + this->codec_->encode_value (data); // Construct a tagged component. IOP::TaggedComponent component; @@ -65,8 +63,7 @@ FOO_IORInterceptor::establish_components ( ACE_ASSERT (component.component_data.length () == length); // Add the tagged component to all profiles. - info->add_ior_component (component - ACE_ENV_ARG_PARAMETER); + info->add_ior_component (component); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -76,8 +73,7 @@ FOO_IORInterceptor::establish_components ( // Add the tagged component to all IIOP profiles. info->add_ior_component_to_profile (component, - IOP::TAG_INTERNET_IOP - ACE_ENV_ARG_PARAMETER); + IOP::TAG_INTERNET_IOP); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -85,29 +81,26 @@ FOO_IORInterceptor::establish_components ( name.in ())); - ACE_TRY + try { // Verify that policy retrieval internals work, and do not cause // memory access violations. CORBA::Policy_var policy = - info->get_effective_policy (PortableServer::THREAD_POLICY_ID - ACE_ENV_ARG_PARAMETER); + info->get_effective_policy (PortableServer::THREAD_POLICY_ID); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Successfully retrieved effective policy.\n")); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch (const CORBA::INV_POLICY& ex) { if (ex.minor () != (CORBA::OMGVMCID | 3)) - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } void FOO_IORInterceptor::components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct a dummy tagged component. @@ -117,33 +110,29 @@ FOO_IORInterceptor::components_established ( component.component_data.length (1); - ACE_TRY_EX (ALL) + try { // Add the tagged component to all profiles. // // This call should fail since it shouldn't be possible to add // an IOR component after establish_components() has been // called. - info->add_ior_component (component - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (ALL); + info->add_ior_component (component); // The above call should NOT have succeeded. - ACE_TRY_THROW_EX (CORBA::INTERNAL (), ALL); + throw CORBA::INTERNAL (); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ex) { if (ex.minor () != (CORBA::OMGVMCID | 14)) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception"); + ex._tao_print_exception ("Unexpected exception"); - ACE_RE_THROW_EX (ALL); + throw; } } - ACE_ENDTRY; - ACE_TRY_EX (PROFILE) + try { // Add the tagged component to all profiles. // @@ -151,31 +140,26 @@ FOO_IORInterceptor::components_established ( // an IOR component after establish_components() has been // called. info->add_ior_component_to_profile (component, - IOP::TAG_INTERNET_IOP - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (PROFILE); + IOP::TAG_INTERNET_IOP); // The above call should NOT have succeeded. - ACE_TRY_THROW_EX (CORBA::INTERNAL (), PROFILE); + throw CORBA::INTERNAL (); } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ex) { if (ex.minor () != (CORBA::OMGVMCID | 14)) { - ACE_PRINT_EXCEPTION (ex, - "Unexpected exception"); + ex._tao_print_exception ("Unexpected exception"); - ACE_RE_THROW_EX (PROFILE); + throw; } } - ACE_ENDTRY; } void FOO_IORInterceptor::adapter_manager_state_changed ( const char *, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -183,8 +167,7 @@ FOO_IORInterceptor::adapter_manager_state_changed ( void FOO_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index a7367fdaf18..2072514f20b 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -68,27 +68,23 @@ public: /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::AdapterState state) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 9fe9a63e57c..b1c050af679 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -13,15 +13,14 @@ ACE_RCSID (IORInterceptor, void FOO_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_IORInterceptor_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = @@ -36,8 +35,7 @@ FOO_IORInterceptor_ORBInitializer::post_init ( // Obtain the CDR encapsulation Codec. IOP::Codec_var codec = - codec_factory->create_codec (encoding - ACE_ENV_ARG_PARAMETER); + codec_factory->create_codec (encoding); PortableInterceptor::IORInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -51,6 +49,5 @@ FOO_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::IORInterceptor_var ior_interceptor = foo; - info->add_ior_interceptor (ior_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_ior_interceptor (ior_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 62daa94f1ae..3904a3b239d 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -54,14 +54,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index a20429818ac..133e8e99a6f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -39,8 +39,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -52,21 +51,20 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "client_orb"); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); FOO::test_var server = - FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + FOO::test::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) { @@ -78,13 +76,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "IORInterceptor test (client-side):"); + ex._tao_print_exception ("IORInterceptor test (client-side):"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index d12fa9eb8a0..93559fb7899 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -42,8 +42,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -55,22 +54,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "test_orb" - ACE_ENV_ARG_PARAMETER); + "test_orb"); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -89,8 +85,7 @@ main (int argc, char *argv[]) obj = server_impl._this (); - FOO::test_var server = FOO::test::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + FOO::test_var server = FOO::test::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -99,7 +94,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -124,14 +119,12 @@ main (int argc, char *argv[]) // The interceptors will be destroyed when we call this orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "IORInterceptor test (server-side):"); + ex._tao_print_exception ("IORInterceptor test (server-side):"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index e966d06dfd9..1856b7702c3 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -17,5 +17,5 @@ test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp index 7d48da494f9..3809deb700b 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp @@ -19,16 +19,14 @@ Server_ORBInitializer::Server_ORBInitializer (bool & destroy_called) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; @@ -43,8 +41,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor); } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h index 1498e7c020c..d4f62cd34eb 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h @@ -46,12 +46,10 @@ public: /// Constructor. Server_ORBInitializer (bool & destroy_called); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: 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 9b0bc3c203a..431b7adbf59 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -36,8 +36,7 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -47,8 +46,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) @@ -59,8 +57,7 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Interceptor::destroy() should not have been called yet. @@ -69,8 +66,7 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -80,8 +76,7 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 8989ac20ec8..df187106cb7 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -67,31 +67,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index 3cd19949ccb..770d8e4b86b 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -41,23 +41,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); + "Client ORB"); if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); - test_var server = test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test_var server = test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -71,13 +67,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "PortableInterceptor ORB::shutdown() test passed.\n")); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 4fa0a28f4eb..8c92a58148a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -41,8 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { bool destroy_called = false; @@ -54,15 +53,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -70,7 +68,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -86,8 +84,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (obj.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "test servant: <%s>\n", @@ -107,7 +104,7 @@ main (int argc, char *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); @@ -115,13 +112,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index 02d6b0dc13a..b1d46d1d3d7 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -29,6 +29,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Shutting down ORB.\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp index f6d8025d7ea..dbccc32eb01 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp @@ -18,31 +18,28 @@ PortableInterceptor::SlotId slot_id = 2093843211; void ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - info->resolve_initial_references ("PICurrent" - ACE_ENV_ARG_PARAMETER); + info->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in ()); if (CORBA::is_nil (pi_current.in ())) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Could not resolve PICurrent object.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ::slot_id = info->allocate_slot_id (); @@ -60,6 +57,5 @@ ClientORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; - info->add_client_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h index f540262ca7b..2dd48ca5938 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h @@ -61,14 +61,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index a6e1556eb00..822b84bd545 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -20,8 +20,7 @@ ClientRequestInterceptor::ClientRequestInterceptor ( } char * -ClientRequestInterceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ClientRequestInterceptor"); @@ -35,8 +34,7 @@ ClientRequestInterceptor::destroy (void) void ClientRequestInterceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -45,21 +43,20 @@ ClientRequestInterceptor::send_request ( if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. - ACE_TRY + try { // Retrieve data from the RSC (request scope current). CORBA::Long number = 0; CORBA::Any_var data = - ri->get_slot (this->slot_id_ - ACE_ENV_ARG_PARAMETER); + ri->get_slot (this->slot_id_); if (!(data.in () >>= number)) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Unable to extract data from Any.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, @@ -75,16 +72,14 @@ ClientRequestInterceptor::send_request ( // Now reset the contents of our slot in the thread-scope // current (TSC). this->pi_current_->set_slot (this->slot_id_, - new_data - ACE_ENV_ARG_PARAMETER); + new_data); // Now retrieve the data from the RSC again. It should not have // changed! CORBA::Long number2 = -1; CORBA::Any_var data2 = - ri->get_slot (this->slot_id_ - ACE_ENV_ARG_PARAMETER); + ri->get_slot (this->slot_id_); if (!(data2.in () >>= number2) || number != number2) @@ -93,23 +88,20 @@ ClientRequestInterceptor::send_request ( "(%P|%t) ERROR: RSC was modified after " "TSC was modified.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "send_request()\n"); + ex._tao_print_exception ("Exception thrown in ""send_request()\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "(%P|%t) Client side RSC/TSC semantics appear " @@ -118,24 +110,21 @@ ClientRequestInterceptor::send_request ( void ClientRequestInterceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -143,8 +132,7 @@ ClientRequestInterceptor::receive_exception ( void ClientRequestInterceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index fe070a88325..dbae0fbfff3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -67,30 +67,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 32918295488..2dc2ce44b33 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -17,8 +17,7 @@ ClientRequestInterceptor2::ClientRequestInterceptor2 ( } char * -ClientRequestInterceptor2::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor2::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ClientRequestInterceptor2"); @@ -32,8 +31,7 @@ ClientRequestInterceptor2::destroy (void) void ClientRequestInterceptor2::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -42,7 +40,7 @@ ClientRequestInterceptor2::send_request ( if (ACE_OS::strcmp (op.in (), "invoke_you") != 0) return; // Don't mess with PICurrent if not invoking test method. - ACE_TRY + try { // The goal of this test is to verify that a request scope // current was successfully shallow copied from a TSC that @@ -54,8 +52,7 @@ ClientRequestInterceptor2::send_request ( CORBA::Long number = 0; CORBA::Any_var data = - ri->get_slot (this->slot_id_ - ACE_ENV_ARG_PARAMETER); + ri->get_slot (this->slot_id_); if (!(data.in () >>= number)) { @@ -63,7 +60,7 @@ ClientRequestInterceptor2::send_request ( "(%P|%t) ERROR: Unable to extract data from " "CORBA::Any retrieved from RSC.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, @@ -71,19 +68,16 @@ ClientRequestInterceptor2::send_request ( number, this->slot_id_)); } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "send_request()\n"); + ex._tao_print_exception ("Exception thrown in ""send_request()\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "(%P|%t) RSC->TSC->RSC copying appears to be working.\n")); @@ -91,24 +85,21 @@ ClientRequestInterceptor2::send_request ( void ClientRequestInterceptor2::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor2::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor2::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -116,8 +107,7 @@ ClientRequestInterceptor2::receive_exception ( void ClientRequestInterceptor2::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index 1007a757f19..f33802ab240 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -63,30 +63,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index d05c9d84a28..f5a3bb414e6 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -15,31 +15,28 @@ PortableInterceptor::SlotId slot_id = 2093843221; void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - info->resolve_initial_references ("PICurrent" - ACE_ENV_ARG_PARAMETER); + info->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in ()); if (CORBA::is_nil (pi_current.in ())) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Could not resolve PICurrent object.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ::slot_id = info->allocate_slot_id (); @@ -57,8 +54,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = server_tmp; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); PortableInterceptor::ClientRequestInterceptor_ptr client_tmp; ACE_NEW_THROW_EX (client_tmp, @@ -72,8 +68,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = client_tmp; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); // Disable collocation -- TAO-specific!!! // @@ -82,8 +77,7 @@ ServerORBInitializer::post_init ( // invocations yet, and we need to force a client request // interceptor to be invoked in this server. TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); + TAO_ORBInitInfo::_narrow (info); tao_info->orb_core ()->optimize_collocation_objects (0); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h index 9c997d45f6c..0f58ff3827b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h @@ -62,14 +62,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 0a9ae728408..f4c58199740 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -34,8 +34,7 @@ ServerRequestInterceptor::destroy (void) void ServerRequestInterceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -45,7 +44,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. - ACE_TRY + try { // Insert data into the RSC (request scope current). @@ -54,35 +53,32 @@ ServerRequestInterceptor::receive_request_service_contexts ( CORBA::Any data; data <<= number; - ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER); + ri->set_slot (this->slot_id_, data); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Inserted number <%d> into RSC.\n", number)); } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "receive_request_service_contexts()\n"); + ex._tao_print_exception ( + "Exception thrown in ""receive_request_service_contexts()\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; } void ServerRequestInterceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_TRY + try { CORBA::Any new_data; CORBA::Long number = 19; @@ -90,14 +86,12 @@ ServerRequestInterceptor::receive_request ( // Set a value in RSC, this should not effect TSC anymore ri->set_slot (this->slot_id_, - new_data - ACE_ENV_ARG_PARAMETER); + new_data); // 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); + this->pi_current_->get_slot (this->slot_id_); CORBA::Long number2 = 0; if ((data2.in () >>= number2) @@ -107,22 +101,19 @@ ServerRequestInterceptor::receive_request ( "(%P|%t) ERROR: TSC was modified because " "RSC was modified.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "send_reply()\n"); + ex._tao_print_exception ("Exception thrown in ""send_reply()\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " @@ -132,8 +123,7 @@ ServerRequestInterceptor::receive_request ( void ServerRequestInterceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -142,7 +132,7 @@ ServerRequestInterceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. - ACE_TRY + try { CORBA::Any_var data; @@ -150,7 +140,7 @@ ServerRequestInterceptor::send_reply ( // should be different from the original data (a CORBA::Long) // stored into the RSC by the receive_request_service_contexts() // interception point. - data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); + data = ri->get_slot (this->slot_id_); // The original data in the RSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -169,7 +159,7 @@ ServerRequestInterceptor::send_reply ( "(%P|%t) Unable to extract data (a string) " "from the RSC.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Now verify that the RSC is truly independent of the TSC. In @@ -183,14 +173,12 @@ ServerRequestInterceptor::send_reply ( // Now reset the contents of our slot in the thread-scope // current (TSC). this->pi_current_->set_slot (this->slot_id_, - new_data - ACE_ENV_ARG_PARAMETER); + new_data); // 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); + ri->get_slot (this->slot_id_); const char *str2 = 0; if (!(data2.in () >>= str2) @@ -200,22 +188,19 @@ ServerRequestInterceptor::send_reply ( "(%P|%t) ERROR: RSC was modified after " "TSC was modified.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "send_reply()\n"); + ex._tao_print_exception ("Exception thrown in ""send_reply()\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " @@ -224,8 +209,7 @@ ServerRequestInterceptor::send_reply ( void ServerRequestInterceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -233,8 +217,7 @@ ServerRequestInterceptor::send_exception ( void ServerRequestInterceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index 73cd1a8156f..b328d594e77 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -66,31 +66,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 8ac95bdcd71..4b08ee9fd3c 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -41,8 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -53,26 +52,22 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "client_orb" - ACE_ENV_ARG_PARAMETER); + "client_orb"); if (parse_args (argc, argv) != 0) return 1; // Get the PICurrent object. CORBA::Object_var obj = - orb->resolve_initial_references ("PICurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in ()); if (CORBA::is_nil (pi_current.in ())) { @@ -91,15 +86,14 @@ main (int argc, char *argv[]) // Now reset the contents of our slot in the thread-scope // current (TSC). pi_current->set_slot (::slot_id, - data - ACE_ENV_ARG_PARAMETER); + data); // Resolve the target object, and perform the invocation. obj = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); PICurrentTest::test_var server = - PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PICurrentTest::test::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) { @@ -118,7 +112,7 @@ main (int argc, char *argv[]) { ACE_ERROR ((LM_ERROR, "(%P|%t) _get_policy_overrides returned nill pointer\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } else { @@ -127,15 +121,14 @@ main (int argc, char *argv[]) { ACE_ERROR ((LM_ERROR, "(%P|%t) _get_policy_overrides returned list with size not equal 0\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } server->invoke_me (); CORBA::Any_var new_data = - pi_current->get_slot (::slot_id - ACE_ENV_ARG_PARAMETER); + pi_current->get_slot (::slot_id); // The original data in the TSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -154,7 +147,7 @@ main (int argc, char *argv[]) "(%P|%t) Unable to extract data (a string) " "from the TSC.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } server->invoke_we (); @@ -164,13 +157,11 @@ main (int argc, char *argv[]) ACE_OS::sleep(1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "PICurrent test (client-side):"); + ex._tao_print_exception ("PICurrent test (client-side):"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index e73136104f3..a19ef3514fb 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -46,8 +46,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -58,20 +57,17 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "test_orb" - ACE_ENV_ARG_PARAMETER); + "test_orb"); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -86,10 +82,10 @@ main (int argc, char *argv[]) if (parse_args (argc, argv) != 0) return -1; - obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); + obj = orb->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in ()); if (CORBA::is_nil (pi_current.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -103,8 +99,7 @@ main (int argc, char *argv[]) obj = server_impl._this (); PICurrentTest::test_var server = - PICurrentTest::test::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PICurrentTest::test::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -113,7 +108,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ())); @@ -138,14 +133,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "PICurrent test (server-side):"); + ex._tao_print_exception ("PICurrent test (server-side):"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index 8de999831ae..334832663a7 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -50,34 +50,29 @@ test_i::invoke_me (void) CORBA::Any_var retrieved_any; - ACE_TRY + try { // Retrieve data placed into RSC PICurrent by the // receive_request_service_contexts() interception point, and // then copied into the TSC current. retrieved_any = - this->current_->get_slot (this->slot_id_ - ACE_ENV_ARG_PARAMETER); + this->current_->get_slot (this->slot_id_); } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "test_i::invoke_me() when calling " - "Current::get_slot\n"); + ex._tao_print_exception ( + "Exception thrown in ""test_i::invoke_me() when calling ""Current::get_slot\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception\n"); + ex._tao_print_exception ("Unexpected exception\n"); } - ACE_ENDTRY; CORBA::Long retrieved; if (retrieved_any.in() >>= retrieved) @@ -90,7 +85,7 @@ test_i::invoke_me (void) "(%P|%t) Problem extracting data from " "CORBA::Any retrieved from TSC.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // ---------------------------------------------------- @@ -110,27 +105,22 @@ test_i::invoke_me (void) data <<= str; - ACE_TRY_EX (foo) + try { this->current_->set_slot (this->slot_id_, - data - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (foo); + data); } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "test_i::invoke_me() when calling " - "Current::set_slot\n"); + ex._tao_print_exception ( + "Exception thrown in ""test_i::invoke_me() when calling ""Current::set_slot\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -156,27 +146,22 @@ test_i::invoke_we (void) data <<= str; - ACE_TRY_EX (foo) + try { this->current_->set_slot (this->slot_id_, - data - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (foo); + data); } - ACE_CATCH (PortableInterceptor::InvalidSlot, ex) + catch (const PortableInterceptor::InvalidSlot& ex) { - ACE_PRINT_EXCEPTION (ex, - "Exception thrown in " - "test_i::invoke_me() when calling " - "Current::set_slot\n"); + ex._tao_print_exception ( + "Exception thrown in ""test_i::invoke_me() when calling ""Current::set_slot\n"); ACE_DEBUG ((LM_DEBUG, "Invalid slot: %u\n", this->slot_id_)); - ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); + throw CORBA::INTERNAL (); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -190,6 +175,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server is shutting down.\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index 135f9cdcab6..8d6ecaa29de 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -33,11 +33,10 @@ IORInterceptor::destroy (void) void IORInterceptor::establish_components ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { PortableInterceptor::ObjectReferenceTemplate_var t = info->adapter_template (); @@ -50,24 +49,20 @@ IORInterceptor::establish_components ( if (a->length () > 1) { CORBA::Policy_var policy ( - info->get_effective_policy (Test::POLICY_TYPE - ACE_ENV_ARG_PARAMETER)); + info->get_effective_policy (Test::POLICY_TYPE)); Test::Policy_var test_policy (Test::Policy::_narrow ( - policy.in () - ACE_ENV_ARG_PARAMETER)); + policy.in ())); this->success_ = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "EXCEPTION: " - "IORInterceptor::establish_components:"); + ex._tao_print_exception ( + "EXCEPTION: ""IORInterceptor::establish_components:"); ACE_ASSERT (false); } - ACE_ENDTRY; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index bec8aef5eec..7699f7b0d33 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -67,8 +67,7 @@ public: /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index ba0fdfa6fb4..6164f1d6270 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -10,8 +10,7 @@ ACE_RCSID (PolicyFactory, CORBA::Policy_ptr PolicyFactory::create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h index 62baa04f807..0b6943c92e1 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h @@ -54,8 +54,7 @@ public: /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp index 0dc54c1a7ae..e454a4f0ccf 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp @@ -18,15 +18,14 @@ ACE_RCSID (PolicyFactory, void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::PolicyFactory_ptr p; @@ -41,8 +40,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::PolicyFactory_var policy_factory (p); info->register_policy_factory (Test::POLICY_TYPE, - policy_factory.in () - ACE_ENV_ARG_PARAMETER); + policy_factory.in ()); PortableInterceptor::IORInterceptor_ptr i; ACE_NEW_THROW_EX (i, @@ -55,6 +53,5 @@ Server_ORBInitializer::post_init ( PortableInterceptor::IORInterceptor_var ior_interceptor (i); - info->add_ior_interceptor (ior_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_ior_interceptor (ior_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h index 89be36a2898..960e020d009 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h @@ -54,14 +54,12 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp index 5dad3cfbb8e..50181bc40e1 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -15,8 +15,7 @@ ACE_RCSID (PolicyFactory, int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -27,13 +26,11 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "test_orb" - ACE_ENV_ARG_PARAMETER); + "test_orb"); // Create the test policy. @@ -42,32 +39,28 @@ main (int argc, char *argv[]) any <<= val; CORBA::Policy_var p (orb->create_policy (Test::POLICY_TYPE, - any - ACE_ENV_ARG_PARAMETER)); + any)); const CORBA::PolicyType ptype = p->policy_type (); // Sanity check. if (ptype != Test::POLICY_TYPE) - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); - Test::Policy_var policy (Test::Policy::_narrow (p.in () - ACE_ENV_ARG_PARAMETER)); + Test::Policy_var policy (Test::Policy::_narrow (p.in ())); const CORBA::ULong pval = policy->value (); // Sanity check. if (val != pval) - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -85,14 +78,13 @@ main (int argc, char *argv[]) PortableServer::POA_var poa = root_poa->create_POA ("Test POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); policy->destroy (); poa_manager->activate (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); @@ -100,14 +92,12 @@ main (int argc, char *argv[]) "\n" "PolicyFactory test succeeded.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "PolicyFactory test:"); + ex._tao_print_exception ("PolicyFactory test:"); return -1; } - ACE_ENDTRY; return 0; } 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 d55a7d9e5c2..c5efb20ea5c 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 @@ -21,14 +21,14 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + corb_->string_to_object (input_); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -38,17 +38,15 @@ Client_Task::svc (void) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client task:"); + ex._tao_print_exception ("Exception caught in client task:"); return 1; } - ACE_ENDTRY; return 0; @@ -56,34 +54,29 @@ Client_Task::svc (void) void -Client_Task::run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +Client_Task::run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); CORBA::Long one = 1, two = 1; (void) server->calculate (one, - two - ACE_ENV_ARG_PARAMETER); + two); - ACE_TRY + try { (void) server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h index 49074e04e89..b0a73533925 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h @@ -27,8 +27,7 @@ public: /// Thread entry point int svc (void); - void run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL); + void run_test (Test_Interceptors::Visual_ptr server); /// The status of the svc loop int status (void) const; 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 fd0619dcc12..de4e62710e2 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 @@ -61,8 +61,7 @@ main (int argc, char *argv[]) server_orb.set ("server_orb"); client_orb.set ("client_orb"); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -132,15 +131,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = CORBA::ORB_init (satc.get_argc (), satc.get_TCHAR_argv (), - server_orb.c_str () - ACE_ENV_ARG_PARAMETER); + server_orb.c_str ()); ACE_Manual_Event me; Server_Task server_task (output, @@ -162,8 +159,7 @@ main (int argc, char *argv[]) CORBA::ORB_var corb = CORBA::ORB_init (catc.get_argc (), catc.get_TCHAR_argv (), - client_orb.c_str () - ACE_ENV_ARG_PARAMETER); + client_orb.c_str ()); Client_Task client_task (input, corb.in (), @@ -211,12 +207,11 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Some exception was caught in main().\n")); return 1; } - ACE_ENDTRY; return 0; } 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 d6923f750d4..ff60616bcad 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 @@ -18,16 +18,14 @@ Echo_Collocated_ORBInitializer::Echo_Collocated_ORBInitializer ( void Echo_Collocated_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Collocated_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = @@ -35,23 +33,21 @@ Echo_Collocated_ORBInitializer::post_init ( // 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); + TAO_ORBInitInfo::_narrow (info); CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = - PortableInterceptor::ORBInitInfo_3_1::_narrow(info - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::ORBInitInfo_3_1::_narrow(info); if (CORBA::is_nil(info_3_1.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) @@ -75,13 +71,11 @@ Echo_Collocated_ORBInitializer::post_init ( policy_list.length (1); policy_list[0] = orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, - client_proc_mode_as_any - ACE_ENV_ARG_PARAMETER); + client_proc_mode_as_any); info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), - policy_list - ACE_ENV_ARG_PARAMETER); + policy_list); policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); @@ -107,13 +101,11 @@ Echo_Collocated_ORBInitializer::post_init ( policy_list.length (1); policy_list[0] = orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, - server_proc_mode_as_any - ACE_ENV_ARG_PARAMETER); + server_proc_mode_as_any); info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), - policy_list - ACE_ENV_ARG_PARAMETER); + policy_list); policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h index 57d361b7b9a..20ccaf9ce43 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h @@ -35,12 +35,10 @@ public: (PortableInterceptor::ProcessingMode server_proc_mode, PortableInterceptor::ProcessingMode client_proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: 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 32cca3aa9dc..1d1ef6bcbc8 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 @@ -26,11 +26,11 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + sorb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,7 +38,7 @@ Server_Task::svc (void) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -49,19 +49,16 @@ Server_Task::svc (void) ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); PortableServer::ObjectId_var id = - root_poa->activate_object (server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -85,15 +82,13 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server task:"); + ex._tao_print_exception ("Exception caught in server task:"); return 1; } - ACE_ENDTRY; return 0; } 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 20d48b0fba4..90b479eda64 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -43,7 +43,6 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,8 +51,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -92,8 +90,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -113,8 +110,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -167,8 +163,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -218,8 +213,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -227,8 +221,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -274,8 +267,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -330,8 +322,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -364,8 +355,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 652a0f4ba9d..26521b44c3c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -40,31 +40,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -93,30 +88,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, 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 c145b2fe700..10d6a5c709b 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 @@ -12,8 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) // ctor void -Visual_i::normal (CORBA::Long - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -21,8 +20,7 @@ Visual_i::normal (CORBA::Long CORBA::Long Visual_i::calculate (CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -34,7 +32,7 @@ Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -42,7 +40,7 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void 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 ab24946aa27..841d3ef41df 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 @@ -27,14 +27,12 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)); void user (void) 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 a1a7b9fbb27..a0e19db9a20 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 @@ -21,14 +21,14 @@ Client_Task::Client_Task (const char *ior, int Client_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); + corb_->string_to_object (input_); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -38,17 +38,15 @@ Client_Task::svc (void) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client task:"); + ex._tao_print_exception ("Exception caught in client task:"); return 1; } - ACE_ENDTRY; return 0; @@ -56,34 +54,29 @@ Client_Task::svc (void) void -Client_Task::run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +Client_Task::run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); CORBA::Long one = 1, two = 1; (void) server->calculate (one, - two - ACE_ENV_ARG_PARAMETER); + two); - ACE_TRY + try { (void) server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h index 3678e806775..3ea2451e0bc 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h @@ -27,8 +27,7 @@ public: /// Thread entry point int svc (void); - void run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL); + void run_test (Test_Interceptors::Visual_ptr server); /// The status of the svc loop int status (void) const; 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 4f1ff3e4708..97154274ed7 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 @@ -16,37 +16,33 @@ Echo_Client_ORBInitializer::Echo_Client_ORBInitializer ( void Echo_Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // 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); + TAO_ORBInitInfo::_narrow (info); CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = - PortableInterceptor::ORBInitInfo_3_1::_narrow(info - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::ORBInitInfo_3_1::_narrow(info); if (CORBA::is_nil(info_3_1.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -68,13 +64,11 @@ Echo_Client_ORBInitializer::post_init ( policy_list.length (1); policy_list[0] = orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, - client_proc_mode_as_any - ACE_ENV_ARG_PARAMETER); + client_proc_mode_as_any); info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), - policy_list - ACE_ENV_ARG_PARAMETER); + policy_list); policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h index 58506555153..ad6ce6e6549 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h @@ -35,12 +35,10 @@ public: Echo_Client_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: 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 bb17b9dcbc4..be6737a8e45 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 @@ -16,16 +16,14 @@ Echo_Server_ORBInitializer::Echo_Server_ORBInitializer ( void Echo_Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = @@ -33,23 +31,21 @@ Echo_Server_ORBInitializer::post_init ( // 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); + TAO_ORBInitInfo::_narrow (info); CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = - PortableInterceptor::ORBInitInfo_3_1::_narrow(info - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::ORBInitInfo_3_1::_narrow(info); if (CORBA::is_nil(info_3_1.in())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } PortableInterceptor::ServerRequestInterceptor_ptr interceptor = @@ -71,13 +67,11 @@ Echo_Server_ORBInitializer::post_init ( policy_list.length (1); policy_list[0] = orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, - proc_mode_as_any - ACE_ENV_ARG_PARAMETER); + proc_mode_as_any); info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), - policy_list - ACE_ENV_ARG_PARAMETER); + policy_list); policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h index f3af07cc4ae..c0e4e83fda7 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h @@ -34,12 +34,10 @@ public: Echo_Server_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: 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 f33f57fbb52..b0b383cf047 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 @@ -26,11 +26,11 @@ Server_Task::Server_Task (const char *output, int Server_Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var poa_object = - sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + sorb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,7 +38,7 @@ Server_Task::svc (void) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -49,19 +49,16 @@ Server_Task::svc (void) ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); PortableServer::ObjectId_var id = - root_poa->activate_object (server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + this->sorb_->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -85,17 +82,15 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); this->sorb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in server task:"); + ex._tao_print_exception ("Exception caught in server task:"); return 1; } - ACE_ENDTRY; return 0; } 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 2fe59bcd88a..14b1bef3587 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 @@ -40,7 +40,6 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -49,8 +48,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -85,8 +83,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -102,8 +99,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { client_interceptor_check_++; @@ -151,8 +147,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 fed9edd4a14..1f4d73fbdd2 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 @@ -39,31 +39,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); 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 52b80caf5d9..0e37ed9a745 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 @@ -46,8 +46,7 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -88,15 +87,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = CORBA::ORB_init (atc.get_argc (), atc.get_TCHAR_argv (), - "" - ACE_ENV_ARG_PARAMETER); + ""); Client_Task client_task (input, orb.in (), @@ -123,12 +120,11 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Some exception was caught in main().\n")); return 1; } - ACE_ENDTRY; return 0; } 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 99dfbe20c3c..4ad894b3f41 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 @@ -39,8 +39,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -48,8 +47,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -90,8 +88,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { ++server_interceptor_check_; @@ -141,8 +138,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -163,7 +159,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_DEBUG ((LM_DEBUG, "No TypeCode information available; perhaps the user IDL\n" " has been compiled with TAO_IDL \"-St -Sa\" options?\n")); - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } ++server_interceptor_check_; @@ -177,8 +173,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 ebdc7d817d8..51b6ba53736 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 @@ -39,30 +39,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC (( CORBA::SystemException, PortableInterceptor::ForwardRequest )); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, 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 43308b6cdfe..2927863b703 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 @@ -46,8 +46,7 @@ main (int argc, char *argv[]) argv) == -1) return -1; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -88,15 +87,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = CORBA::ORB_init (atc.get_argc (), atc.get_TCHAR_argv (), - "" - ACE_ENV_ARG_PARAMETER); + ""); ACE_Manual_Event me; Server_Task server_task (output, @@ -125,12 +122,11 @@ main (int argc, char *argv[]) return 1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Some exception was caught in main().\n")); return 1; } - ACE_ENDTRY; return 0; } 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 066a8eee6b3..9b5c7b32e41 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 @@ -11,8 +11,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) // ctor void -Visual_i::normal (CORBA::Long - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -20,8 +19,7 @@ Visual_i::normal (CORBA::Long CORBA::Long Visual_i::calculate (CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -33,7 +31,7 @@ Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -41,7 +39,7 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void 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 ab24946aa27..841d3ef41df 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 @@ -27,14 +27,12 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long two) ACE_THROW_SPEC ((CORBA::SystemException)); void user (void) diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp index 0fb8a894577..4c9307fbfcb 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp @@ -19,16 +19,14 @@ Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) : void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { ++pre_init_called; if (second_ != 0) { - PortableInterceptor::register_orb_initializer (second_ - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (second_); // Registered the initializer, clear the pointer so that we only do it // once @@ -38,8 +36,7 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { ++post_init_called; diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h index 15b78e94a6e..677200a461a 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (Client_ORBInitializer *second); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); int pre_init_called; diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp index 6cad0525051..20cda8787f3 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp @@ -27,24 +27,21 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer_var2 = initializer2; - ACE_TRY_NEW_ENV + try { - PortableInterceptor::register_orb_initializer (initializer_var1.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer_var1.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "SecondORB"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client:"); + ex._tao_print_exception ("Caught exception in client:"); return 1; } - ACE_ENDTRY; // The first ORBInitializer should be called twice, the second only once ACE_ASSERT (initializer1->pre_init_called == 2); diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index 77b56d9aae6..4cc398ba54a 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -15,16 +15,14 @@ ACE_RCSID (Redirection, void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); @@ -56,8 +54,7 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h index dde588fb113..4b0c0c76dba 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h @@ -30,12 +30,10 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp index 9cf394aa5b5..5ab71be7307 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp @@ -72,7 +72,7 @@ Client_Request_Interceptor::receive_exception ( this->orb_->string_to_object (this->forward_str_.in ()); // Notice that this is not a permanent forward. - ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ())); + throw PortableInterceptor::ForwardRequest (forward.in ()); } void diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index fa98f896530..6484f63d591 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -17,16 +17,14 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; @@ -38,8 +36,7 @@ Server_ORBInitializer::post_init ( ENOMEM), CORBA::COMPLETED_NO)); - info->add_server_request_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor); } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h index fffd3e7b89c..4c9e39a2d38 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h @@ -36,12 +36,10 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index 93c9c18b938..78622ae0627 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -33,8 +33,7 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -43,8 +42,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -52,8 +50,7 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1); @@ -61,8 +58,7 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -70,8 +66,7 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 3d1a75e1528..2bb20759f75 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -49,31 +49,26 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp index 4bb1941106e..4dab792cc64 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp @@ -48,8 +48,7 @@ main (int argc, char *argv[]) { int status = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -61,23 +60,21 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); + "Client ORB"); if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior1); RedirectionTest::test_var server = - RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + RedirectionTest::test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -104,13 +101,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; if (status != -1) ACE_DEBUG ((LM_INFO, diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index 2eb62181a6e..4fc9c966cd7 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -49,8 +49,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { #if TAO_HAS_INTERCEPTORS == 1 Server_ORBInitializer *temp_initializer = 0; @@ -60,15 +59,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -76,7 +74,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -92,7 +90,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); FILE *output_file= ACE_OS::fopen (ior_file, "w"); if (output_file == 0) @@ -109,19 +107,17 @@ main (int argc, char *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index ab24a5f150b..e5a76646be9 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -31,5 +31,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 a39c6f98ec4..0ca898c19ca 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -18,8 +18,7 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr orbinitinfo - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr orbinitinfo) ACE_THROW_SPEC ((CORBA::SystemException)) { POA_TestModule::test* test = 0; @@ -29,72 +28,63 @@ Server_ORBInitializer::pre_init ( CORBA::Object_ptr object = test->_this (); orbinitinfo->register_initial_reference ("MyService", - object - ACE_ENV_ARG_PARAMETER); + object); bool invalid_name = false; - ACE_TRY + try { // Registering with an empty string should give an exception orbinitinfo->register_initial_reference ("", - object - ACE_ENV_ARG_PARAMETER); + object); } - ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex) + catch (const PortableInterceptor::ORBInitInfo::InvalidName& ex) { invalid_name = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!invalid_name) ACE_ERROR ((LM_ERROR, "ERROR: Registering with an empty string doesn't " "throw an exception\n")); bool duplicate_name = false; - ACE_TRY_EX (duplicate) + try { // Registering with an duplicate string should give an exception orbinitinfo->register_initial_reference ("MyService", - object - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (duplicate) ; + object); } - ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex) + catch (const PortableInterceptor::ORBInitInfo::InvalidName& ex) { duplicate_name = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!duplicate_name) ACE_ERROR ((LM_ERROR, "ERROR: Registering with a duplicate with ORBInitInfo " "doesn't throw the expected exception\n")); bool invalid_object = false; - ACE_TRY_EX (invalid) + try { // Registering with a nil object orbinitinfo->register_initial_reference ("NilServer", - CORBA::Object::_nil() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (invalid); + CORBA::Object::_nil()); } - ACE_CATCH (CORBA::BAD_PARAM , ex) + catch (const CORBA::BAD_PARAM& ex) { if (ex.minor () == (CORBA::OMGVMCID | 27)) { invalid_object = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!invalid_object) ACE_ERROR ((LM_ERROR, "ERROR: Registering with a nil object to ORBInitInfo " @@ -103,8 +93,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h index 3b9e5407eaf..d9c602a0dec 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h @@ -32,12 +32,10 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp index 66a8db517fb..f71fab5d877 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Recursive_ORBInitializer, "$Id$") -int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) +int test_orb (CORBA::ORB_ptr orb) { int errors = 0; @@ -20,25 +20,22 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) CORBA::Object_ptr object = test->_this (); orb->register_initial_reference ("ORBMyService", - object - ACE_ENV_ARG_PARAMETER); + object); bool invalid_name = false; - ACE_TRY + try { // Registering with an empty string should give an exception orb->register_initial_reference ("", - object - ACE_ENV_ARG_PARAMETER); + object); } - ACE_CATCH (CORBA::ORB::InvalidName, ex) + catch (const CORBA::ORB::InvalidName& ex) { invalid_name = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!invalid_name) { @@ -48,22 +45,19 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) } bool duplicate_name = false; - ACE_TRY_EX (duplicate) + try { // Registering with an duplicate string should give an exception orb->register_initial_reference ("ORBMyService", - object - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (duplicate); + object); } - ACE_CATCH (CORBA::ORB::InvalidName, ex) + catch (const CORBA::ORB::InvalidName& ex) { duplicate_name = true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!duplicate_name) { @@ -73,25 +67,22 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) } bool invalid_object = false; - ACE_TRY_EX (invalid) + try { // Registering with a nil object orb->register_initial_reference ("ORBNilServer", - CORBA::Object::_nil() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (invalid); + CORBA::Object::_nil()); } - ACE_CATCH (CORBA::BAD_PARAM , ex) + catch (const CORBA::BAD_PARAM& ex) { if ((ex.minor() & 0xFFFU) == 27) { invalid_object = true; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (!invalid_object) { @@ -116,26 +107,23 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer_var = initializer; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); - retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER); + retval = test_orb (orb.in ()); - PortableInterceptor::register_orb_initializer (initializer_var.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer_var.in ()); CORBA::ORB_var second_orb = - CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "SecondORB"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in server:"); + ex._tao_print_exception ("Caught exception in server:"); return 1; } - ACE_ENDTRY; return retval; } 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 5d2c4b0bfe0..047efb616ff 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -13,16 +13,14 @@ ACE_RCSID (Request_Interceptor_Flow, void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -40,8 +38,7 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (ci_interceptor.in ()); ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT B"), @@ -53,8 +50,7 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (ci_interceptor.in ()); ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT C"), @@ -66,6 +62,5 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (ci_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h index 9a14c62287c..affe429a3c5 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h @@ -45,12 +45,10 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; 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 337a9c2810e..c9404a9a380 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 @@ -18,13 +18,12 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name) void Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri ACE_ENV_ARG_PARAMETER); + this->client_side_test (ri); if (!client_side) return; // Don't continue if the server side is being tested. @@ -55,7 +54,7 @@ Client_Request_Interceptor::send_request ( // (NO_PERMISSION, in this case). ACE_DEBUG ((LM_DEBUG, " raised CORBA::NO_PERMISSION exception\n")); - ACE_THROW (CORBA::NO_PERMISSION ()); // Expected exception. + throw CORBA::NO_PERMISSION (); // Expected exception. default: break; @@ -75,13 +74,12 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = - this->client_side_test (ri ACE_ENV_ARG_PARAMETER); + this->client_side_test (ri); if (!client_side) return; // Don't continue if the server side is being tested. @@ -95,13 +93,12 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = - this->client_side_test (ri ACE_ENV_ARG_PARAMETER); + this->client_side_test (ri); if (!client_side) return; // Don't continue if the server side is being tested. @@ -134,7 +131,7 @@ Client_Request_Interceptor::receive_reply ( // (NO_PERMISSION, in this case). ACE_DEBUG ((LM_DEBUG, " raised CORBA::NO_PERMISSION exception\n")); - ACE_THROW (CORBA::NO_PERMISSION ()); // Expected exception. + throw CORBA::NO_PERMISSION (); // Expected exception. default: break; @@ -152,14 +149,13 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri ACE_ENV_ARG_PARAMETER); + this->client_side_test (ri); if (!client_side) return; // Don't continue if the server side is being tested. @@ -207,7 +203,7 @@ Client_Request_Interceptor::receive_exception ( "CORBA::NO_PERMISSION exception\n")); // Expected exception. - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } else { @@ -232,14 +228,13 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri ACE_ENV_ARG_PARAMETER); + this->client_side_test (ri); if (!client_side) return; // Don't continue if the server side is being tested. @@ -253,8 +248,7 @@ Client_Request_Interceptor::receive_other ( CORBA::Boolean Client_Request_Interceptor::client_side_test ( - PortableInterceptor::ClientRequestInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr info) { CORBA::String_var op = info->operation (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h index bb1f24cbdcc..e9ca7b9d507 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h @@ -60,30 +60,25 @@ public: */ //@{ virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} @@ -93,8 +88,7 @@ private: // Returns 1 if the client-side test is currently being run, and 0 // otherwise. CORBA::Boolean client_side_test ( - PortableInterceptor::ClientRequestInfo_ptr info - ACE_ENV_ARG_DECL); + PortableInterceptor::ClientRequestInfo_ptr info); }; 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 f6417e34397..5c715ff03e3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -14,8 +14,7 @@ Request_Interceptor::Request_Interceptor (const char *name) } char * -Request_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Request_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); @@ -40,7 +39,7 @@ Request_Interceptor::destroy (void) "is zero\n", s_count, this->name_.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } if (e_count == 0) @@ -51,7 +50,7 @@ Request_Interceptor::destroy (void) "is zero\n", e_count, this->name_.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } if (s_count != e_count) @@ -67,6 +66,6 @@ Request_Interceptor::destroy (void) s_count, e_count)); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } 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 c7146736418..d9f79479560 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -11,16 +11,14 @@ ACE_RCSID (Request_Interceptor_Flow, void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,8 +36,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (si_interceptor.in ()); ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER B"), @@ -51,8 +48,7 @@ Server_ORBInitializer::post_init ( si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (si_interceptor.in ()); ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER C"), @@ -64,6 +60,5 @@ Server_ORBInitializer::post_init ( si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (si_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h index 0d011a67032..f8819bb9bc3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h @@ -45,12 +45,10 @@ class Server_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; 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 3a80bebc486..44952a79f1d 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 @@ -21,14 +21,13 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name) void Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri ACE_ENV_ARG_PARAMETER); + this->server_side_test (ri); if (!server_side) return; // Don't continue if the client side is being tested. @@ -52,7 +51,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( // (NO_PERMISSION, in this case). ACE_DEBUG ((LM_DEBUG, " raised CORBA::NO_PERMISSION exception\n")); - ACE_THROW (CORBA::NO_PERMISSION ()); // Expected exception. + throw CORBA::NO_PERMISSION (); // Expected exception. default: break; @@ -67,14 +66,13 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri ACE_ENV_ARG_PARAMETER); + this->server_side_test (ri); if (!server_side) return; // Don't continue if the client side is being tested. @@ -86,13 +84,12 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean server_side = - this->server_side_test (ri ACE_ENV_ARG_PARAMETER); + this->server_side_test (ri); if (!server_side) return; // Don't continue if the client side is being tested. @@ -125,7 +122,7 @@ Server_Request_Interceptor::send_reply ( // (NO_PERMISSION, in this case). ACE_DEBUG ((LM_DEBUG, " raised CORBA::NO_PERMISSION exception\n")); - ACE_THROW (CORBA::NO_PERMISSION ()); // Expected exception. + throw CORBA::NO_PERMISSION (); // Expected exception. default: break; @@ -143,14 +140,13 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri ACE_ENV_ARG_PARAMETER); + this->server_side_test (ri); if (!server_side) return; // Don't continue if the client side is being tested. @@ -198,7 +194,7 @@ Server_Request_Interceptor::send_exception ( "CORBA::NO_PERMISSION exception\n")); // Expected exception. - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } else { @@ -223,14 +219,13 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri ACE_ENV_ARG_PARAMETER); + this->server_side_test (ri); if (!server_side) return; // Don't continue if the client side is being tested. @@ -244,8 +239,7 @@ Server_Request_Interceptor::send_other ( CORBA::Boolean Server_Request_Interceptor::server_side_test ( - PortableInterceptor::ServerRequestInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr info) { CORBA::String_var op = info->operation (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h index e0a9c66c947..ac5b56bff1e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h @@ -60,31 +60,26 @@ public: */ //@{ virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} @@ -94,8 +89,7 @@ private: /// Returns 1 if the server-side test is currently being run, and 0 /// otherwise. CORBA::Boolean server_side_test ( - PortableInterceptor::ServerRequestInfo_ptr info - ACE_ENV_ARG_DECL); + PortableInterceptor::ServerRequestInfo_ptr info); private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index b607ad6df22..795e8033ed1 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -43,7 +43,7 @@ parse_args (int argc, char *argv[]) } void -client_test (Test_ptr server ACE_ENV_ARG_DECL) +client_test (Test_ptr server) { // Currently, there are only four scenarios for the client side // tests. @@ -56,9 +56,9 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) "------------------\n", i)); - ACE_TRY + try { - server->client_test (i ACE_ENV_ARG_PARAMETER); + server->client_test (i); if (i == 1) { @@ -67,36 +67,35 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) "operation.\n")); } } - ACE_CATCH (Test::X, ex) + catch (const Test::X& ex) { // Expected exception. Ignore it. } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { // Expected exception. Ignore it. } - ACE_CATCH (Test::UnknownScenario, ex) + catch (const Test::UnknownScenario& ex) { ACE_ERROR ((LM_ERROR, "\nERROR: Unknown scenario <%d> condition " "returned from client_test() " "operation.\n", ex.scenario)); - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "\nERROR: Exception thrown from client_test() " "operation.\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } void -server_test (Test_ptr server ACE_ENV_ARG_DECL) +server_test (Test_ptr server) { // Currently, there are only four scenarios for the server side // tests. @@ -109,10 +108,10 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) "------------------\n", i)); - ACE_TRY + try { CORBA::ULongSeq_var ulongseq; - server->server_test (i, ulongseq.out () ACE_ENV_ARG_PARAMETER); + server->server_test (i, ulongseq.out ()); if (i == 1) { @@ -121,39 +120,37 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) "operation.\n")); } } - ACE_CATCH (Test::X, ex) + catch (const Test::X& ex) { // Expected exception. Ignore it. } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { // Expected exception. Ignore it. } - ACE_CATCH (Test::UnknownScenario, ex) + catch (const Test::UnknownScenario& ex) { ACE_ERROR ((LM_ERROR, "\nERROR: Unknown scenario <%d> condition " "returned from server_test() " "operation.\n", ex.scenario)); - ACE_RE_THROW; + throw; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "\nERROR: Exception thrown from server_test() " "operation.\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -164,22 +161,20 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); + "Client ORB"); if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_var server = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -189,21 +184,19 @@ main (int argc, char *argv[]) 1); } - ::client_test (server.in () ACE_ENV_ARG_PARAMETER); + ::client_test (server.in ()); - ::server_test (server.in () ACE_ENV_ARG_PARAMETER); + ::server_test (server.in ()); server->shutdown (); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, "Request interceptor flow test passed.\n")); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index dcad7d0eb54..d8d4fd6b79a 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -46,8 +46,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Server_ORBInitializer *temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, @@ -56,14 +55,13 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB"); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +69,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -84,7 +82,7 @@ main (int argc, char *argv[]) CORBA::Object_var obj = servant._this (); CORBA::String_var ior = - orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", @@ -106,19 +104,17 @@ main (int argc, char *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } 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 e9cd269b863..2a9f74f7eca 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::client_test (Test::TestScenario scenario - ACE_ENV_ARG_DECL) +test_i::client_test (Test::TestScenario scenario) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -24,19 +23,18 @@ test_i::client_test (Test::TestScenario scenario case 4: // Both the client-side and server-side tests throw this // exception in these scenarios. - ACE_THROW (Test::X ()); // Expected test exception + throw Test::X (); // Expected test exception case 2: case 3: break; default: - ACE_THROW (Test::UnknownScenario (scenario)); // Unexpected! + throw Test::UnknownScenario (scenario); // Unexpected! } } void test_i::server_test (Test::TestScenario scenario, - CORBA::ULongSeq_out myseq - ACE_ENV_ARG_DECL) + CORBA::ULongSeq_out myseq) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -49,12 +47,12 @@ test_i::server_test (Test::TestScenario scenario, case 4: // Both the client-side and server-side tests throw this // exception in these scenarios. - ACE_THROW (Test::X ()); // Expected test exception + throw Test::X (); // Expected test exception case 2: case 3: break; default: - ACE_THROW (Test::UnknownScenario (scenario)); // Unexpected! + throw Test::UnknownScenario (scenario); // Unexpected! } } @@ -65,5 +63,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 844bd60bc94..ad5b2be3b75 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -33,16 +33,14 @@ public: test_i (CORBA::ORB_ptr orb); /// The client-side test operation. - virtual void client_test (Test::TestScenario scenario - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void client_test (Test::TestScenario scenario) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); /// The server-side test operation. virtual void server_test (Test::TestScenario scenario, - CORBA::ULongSeq_out myseq - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::ULongSeq_out myseq) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); 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 4ce9d465ca0..81394e0fdbd 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -14,16 +14,14 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41,7 +39,6 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h index 569419fb346..c232ee05e1a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; 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 97f30fa7092..98962f028bc 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -14,16 +14,14 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor = @@ -37,7 +35,6 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h index 992070c71e1..b43bcf07b7d 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index ed6361d5ece..2949040ebb8 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -37,11 +37,10 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server - ACE_ENV_ARG_DECL) +run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10 ACE_ENV_ARG_PARAMETER); + server->normal (10); ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); @@ -49,32 +48,29 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); - ACE_TRY + try { server->user (); } - ACE_CATCH (Test_Interceptors::Silly, userex) + catch (const Test_Interceptors::Silly& userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } - ACE_ENDTRY; - ACE_TRY_EX (SYS) + try { server->system (); - ACE_TRY_CHECK_EX (SYS); } - ACE_CATCH (CORBA::INV_OBJREF, sysex) + catch (const CORBA::INV_OBJREF& sysex) { ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } - ACE_ENDTRY; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -84,20 +80,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -107,17 +102,15 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in client:"); + ex._tao_print_exception ("Caught exception in client:"); return 1; } - ACE_ENDTRY; return 0; } 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 d054310e84c..e6318e00110 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -40,8 +40,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -49,8 +48,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -59,8 +57,7 @@ Echo_Client_Request_Interceptor::send_request ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -68,7 +65,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -94,11 +91,11 @@ 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); + ri->add_request_service_context (sc, 0); // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -116,8 +113,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -125,8 +121,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -134,7 +129,7 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -148,7 +143,7 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -167,7 +162,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -184,8 +179,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -196,8 +190,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -206,8 +199,7 @@ Echo_Client_Request_Interceptor::receive_exception ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -215,7 +207,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -229,7 +221,7 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -249,7 +241,7 @@ 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); + ri->get_request_service_context (::service_id); 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 2214ee1e99a..af32be9e149 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index f6fce516ba9..6b1af478aef 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -51,15 +51,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); // Now we can create the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -67,7 +66,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -80,19 +79,16 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -115,15 +111,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception in server:"); + ex._tao_print_exception ("Caught exception in server:"); return 1; } - ACE_ENDTRY; return 0; } 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 601e2028709..ef37b2b4ab4 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -38,8 +38,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -54,7 +53,7 @@ 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); + ri->get_request_service_context (id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -85,14 +84,13 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( scc.context_data.replace (string_len, string_len, buff, 1); // Add this context to the service context list. - ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); + ri->add_reply_service_context (scc, 0); } void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -101,8 +99,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -115,7 +112,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -135,7 +132,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -152,8 +149,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -169,7 +165,7 @@ 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); + ri->get_reply_service_context (::service_id); const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -189,7 +185,7 @@ 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); + ri->get_request_service_context (::service_id); const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -206,8 +202,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 6fc60276759..cc14ce6591b 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h @@ -38,28 +38,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); 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 a7839f0a2cd..925f856c0b5 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -13,8 +13,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) } void -Visual_i::normal (CORBA::Long arg - ACE_ENV_ARG_DECL_NOT_USED) +Visual_i::normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -33,7 +32,7 @@ Visual_i::user (void) Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); - ACE_THROW (Test_Interceptors::Silly ()); + throw Test_Interceptors::Silly (); } void @@ -41,12 +40,12 @@ Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); - ACE_THROW (CORBA::INV_OBJREF ()); + throw CORBA::INV_OBJREF (); } void Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } 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 fbe117ea5d2..cda32b963d9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -28,8 +28,7 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void normal (CORBA::Long arg) ACE_THROW_SPEC ((CORBA::SystemException)); void nothing (void) diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index e7bce8edc2d..061af3a31b4 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -14,16 +14,15 @@ main (int argc, char *argv[]) QApplication app (argc, argv); TAO::QtResource_Loader qt_resources (&app); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); Client client (orb.in (), app); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (argc, argv); // Creates the Qt widgets client.create_widgets (); @@ -37,12 +36,11 @@ main (int argc, char *argv[]) app.exec (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -61,8 +59,7 @@ Client::~Client (void) void Client::parse_args (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { const char *ior = "file://test.ior"; @@ -85,10 +82,10 @@ Client::parse_args (int argc, } CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); this->server_ = - LCD_Display::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + LCD_Display::_narrow (object.in ()); if (CORBA::is_nil(this->server_.in ())) { @@ -98,7 +95,7 @@ Client::parse_args (int argc, } void -Client::create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Client::create_widgets (/**/) { // Ewsize the box this->box_.resize (200,120); diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index 9d155fda05d..0b1d9be90c4 100644 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -40,8 +40,7 @@ public: void show (void); - void parse_args (int argc, char *argv[] - ACE_ENV_ARG_DECL); + void parse_args (int argc, char *argv[]); QVBox box_; // A box widget.. diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index ecf985bcae0..28fef907bfc 100644 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -57,14 +57,13 @@ main (int argc, char *argv[]) QApplication app (argc, argv); TAO::QtResource_Loader qt_resources (&app); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,7 +71,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -104,7 +103,7 @@ main (int argc, char *argv[]) // End of QT specific stuff.. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -127,12 +126,10 @@ main (int argc, char *argv[]) app.exec (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 7de1f9a7d44..1f58c4db4ae 100644 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -23,8 +23,7 @@ LCD_Display_imp::shutdown (void) } void -LCD_Display_imp::send_val (CORBA::Long val - ACE_ENV_ARG_DECL_NOT_USED) +LCD_Display_imp::send_val (CORBA::Long val) 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 857dca4b5c6..1305ce328e4 100644 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -39,8 +39,7 @@ public: void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_val (CORBA::Long val - ACE_ENV_ARG_DECL_NOT_USED) + void send_val (CORBA::Long val) ACE_THROW_SPEC ((CORBA::SystemException)); signals: diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index 89a29ffbc1f..f32e7ebb006 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -23,30 +23,25 @@ public: int main(int, char**) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int argc = 0; CORBA::ORB_var orb1 = - CORBA::ORB_init(argc, 0, "orb1" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init(argc, 0, "orb1"); CORBA::ORB_var orb2 = - CORBA::ORB_init(argc, 0, "orb2" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init(argc, 0, "orb2"); CORBA::Object_var poaObj_var = - orb1->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb1->resolve_initial_references ("RootPOA"); PortableServer::POA_var rootPoa = - PortableServer::POA::_narrow (poaObj_var.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObj_var.in ()); PortableServer::POAManager_var poaManager = rootPoa->the_POAManager (); CORBA::Object_var poaObj_var2 = - orb2->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb2->resolve_initial_references ("RootPOA"); PortableServer::POA_var rootPoa2 = - PortableServer::POA::_narrow (poaObj_var2.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObj_var2.in ()); PortableServer::POAManager_var poaManager2 = rootPoa2->the_POAManager (); @@ -62,32 +57,24 @@ int main(int, char**) PortableServer::ServantBase_var m2_var = m2; PortableServer::ObjectId_var monitorableId1_var = - rootPoa->activate_object (monitorable_var.in () - ACE_ENV_ARG_PARAMETER); + rootPoa->activate_object (monitorable_var.in ()); CORBA::Object_var obj1 = - rootPoa->id_to_reference (monitorableId1_var.in () - ACE_ENV_ARG_PARAMETER); + rootPoa->id_to_reference (monitorableId1_var.in ()); Arch_Idl::Monitorable_var monitorable1 = - Arch_Idl::Monitorable::_narrow (obj1.in () - ACE_ENV_ARG_PARAMETER); + Arch_Idl::Monitorable::_narrow (obj1.in ()); PortableServer::ObjectId_var monitorableId2_var = - rootPoa2->activate_object (m2_var.in () - ACE_ENV_ARG_PARAMETER); + rootPoa2->activate_object (m2_var.in ()); CORBA::Object_var obj2 = - rootPoa2->id_to_reference (monitorableId2_var.in () - ACE_ENV_ARG_PARAMETER); + rootPoa2->id_to_reference (monitorableId2_var.in ()); Arch_Idl::Monitorable_var monitorable2 = - Arch_Idl::Monitorable::_narrow (obj2.in () - ACE_ENV_ARG_PARAMETER); + Arch_Idl::Monitorable::_narrow (obj2.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 7e724bdff8f..a7236c2d60f 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -42,17 +42,15 @@ parse_args (int argc, char *argv[]) } CORBA::Short -get_server_priority (Test_ptr server - ACE_ENV_ARG_DECL) +get_server_priority (Test_ptr server) { // Get the Priority Model Policy from the stub. CORBA::Policy_var policy = - server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE); // Narrow down to correct type. RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); // Make sure that we have the SERVER_DECLARED priority model. RTCORBA::PriorityModel priority_model = @@ -69,33 +67,30 @@ get_server_priority (Test_ptr server void invocation_exception_test (Test_ptr obj, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) { - ACE_TRY + try { // Invoke method on test object. obj->test_method (1, - priority - ACE_ENV_ARG_PARAMETER); + priority); // This next line of code should not run because an exception // should have been raised. ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n")); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch (const CORBA::INV_POLICY& ) { // Expected exception. ACE_DEBUG ((LM_DEBUG, "INV_POLICY exception is caught as expected.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Unexpected exception. ACE_DEBUG ((LM_DEBUG, "Error: unexpected exception caught\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } class Task : public ACE_Task_Base @@ -121,40 +116,34 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { // Get the RTORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); // Get the RTCurrent. object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); // Test object 1 (with CLIENT_PROPAGATED priority model). object = - this->orb_->string_to_object (ior1 - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior1); Test_var client_propagated_obj = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); // Test object 2 (with SERVER_DECLARED priority model). - object = this->orb_->string_to_object (ior2 - ACE_ENV_ARG_PARAMETER); + object = this->orb_->string_to_object (ior2); Test_var server_declared_obj = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); // Test: Attempt to set priority bands that do not match server // resource configuration on the <client_propagated_obj>. @@ -172,29 +161,25 @@ Task::svc (void) CORBA::PolicyList policies; policies.length (1); policies[0] = - rt_orb->create_priority_banded_connection_policy (false_bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (false_bands); // Set false bands at the object level. Note that a new object // is returned. object = client_propagated_obj->_set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); client_propagated_obj = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); // Invoking on this object with false bands should produce an // exception. invocation_exception_test (client_propagated_obj.in (), - 0 - ACE_ENV_ARG_PARAMETER); + 0); // 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); + server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE); RTCORBA::PriorityBandedConnectionPolicy_var bands_policy = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policies[0]); @@ -206,12 +191,11 @@ Task::svc (void) // object is returned. object = client_propagated_obj->_set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); // Overwrite existing <client_propagated_obj>. client_propagated_obj = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); // Test: Attempt invocation on <client_propagated_obj> with // client thread priority not matching any of the bands. Should @@ -225,14 +209,12 @@ Task::svc (void) bands[bands->length () - 1].high + 1; // Reset the current thread's priority. - current->the_priority (client_priority - ACE_ENV_ARG_PARAMETER); + current->the_priority (client_priority); // 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); + client_priority); // Test: Make invocations on the <client_propagated_obj>. ACE_DEBUG ((LM_DEBUG, @@ -248,13 +230,11 @@ Task::svc (void) (bands[i].low + bands[i].high) / 2; // Reset the current thread's priority. - current->the_priority (client_priority - ACE_ENV_ARG_PARAMETER); + current->the_priority (client_priority); // Invoke test method on server. client_propagated_obj->test_method (1, // CLIENT_PROPAGATED - client_priority - ACE_ENV_ARG_PARAMETER); + client_priority); } // Test: Attempt invocation with the same thread priority, but @@ -264,24 +244,21 @@ Task::svc (void) // Get the <server_priority> from the stub. CORBA::Short server_priority = - get_server_priority (server_declared_obj.in () - ACE_ENV_ARG_PARAMETER); + get_server_priority (server_declared_obj.in ()); // Invoke test method on server. server_declared_obj->test_method (0, // SERVER_DECLARED - server_priority - ACE_ENV_ARG_PARAMETER); + server_priority); // Testing over. Shut down Server ORB. server_declared_obj->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in Banded_Connections test client:"); + ex._tao_print_exception ( + "Unexpected exception in Banded_Connections test client:"); return -1; } - ACE_ENDTRY; return 0; } @@ -289,14 +266,13 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Parse arguments. int result = @@ -347,13 +323,12 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in Banded_Connections test client:"); + ex._tao_print_exception ( + "Unexpected exception in Banded_Connections test client:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index ece7dea038e..de595175f04 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -11,12 +11,10 @@ class Test_i : public POA_Test { public: Test_i (CORBA::ORB_ptr orb, - RTCORBA::PriorityBands &bands - ACE_ENV_ARG_DECL); + RTCORBA::PriorityBands &bands); void test_method (CORBA::Boolean client_propagated, - CORBA::Short priority - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -29,26 +27,22 @@ private: }; Test_i::Test_i (CORBA::ORB_ptr orb, - RTCORBA::PriorityBands &bands - ACE_ENV_ARG_DECL) + RTCORBA::PriorityBands &bands) : orb_ (CORBA::ORB::_duplicate (orb)), bands_ (bands), rt_current_ () { // We resolve and store the RT Current for later use. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); this->rt_current_ = - RTCORBA::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in ()); } void Test_i::test_method (CORBA::Boolean client_propagated, - CORBA::Short client_priority - ACE_ENV_ARG_DECL) + CORBA::Short client_priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the upcall thread's priority. @@ -116,8 +110,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -228,23 +221,19 @@ int create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register servant with the POA. PortableServer::ObjectId_var id; - id = poa->activate_object (server_impl - ACE_ENV_ARG_PARAMETER); + id = poa->activate_object (server_impl); // Create object reference. CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // Print ior to the file. if (filename != 0) @@ -268,68 +257,62 @@ create_object (PortableServer::POA_ptr poa, void object_activation_exception_test (RTPortableServer::POA_ptr poa, Test_i *server_impl, - CORBA::Short priority - ACE_ENV_ARG_DECL) + CORBA::Short priority) { - ACE_TRY + try { // Register servant with POA. PortableServer::ObjectId_var id = poa->activate_object_with_priority (server_impl, - priority - ACE_ENV_ARG_PARAMETER); + priority); // This next line of code should not run because an exception // should have been raised. ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n")); } - ACE_CATCH (CORBA::BAD_PARAM, ex) + catch (const CORBA::BAD_PARAM& ex) { // Expected exception. ACE_DEBUG ((LM_DEBUG, "BAD_PARAM exception is caught as expected.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Unexpected exception. ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception caught\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } void poa_creation_exception_test (PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr manager, - CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) + CORBA::PolicyList &policies) { - ACE_TRY + try { // Create a POA with invalid policies. PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); // This next line of code should not run because an exception // should have been raised. ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n")); } - ACE_CATCH (PortableServer::POA::InvalidPolicy, ex) + catch (const PortableServer::POA::InvalidPolicy& ex) { // Expected exception. ACE_DEBUG ((LM_DEBUG, "InvalidPolicy exception is caught as expected.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Unexpected exception. ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } int @@ -337,14 +320,13 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb; - ACE_TRY_NEW_ENV + try { // Initialize ORB. orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Parse arguments. int result = @@ -360,20 +342,17 @@ main (int argc, char *argv[]) // Get the RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); // Get the RootPOA. object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POA Manager. PortableServer::POAManager_var poa_manager = @@ -421,8 +400,7 @@ main (int argc, char *argv[]) allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); // Test: Attempt to create a POA with priority bands that do not // match the lanes. Should get POA::InvalidPolicy exception. @@ -439,20 +417,17 @@ main (int argc, char *argv[]) // Create a bands policy. poa_policy_list[0] = - rt_orb->create_priority_banded_connection_policy (false_bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (false_bands); // Create a thread-pool policy. poa_policy_list[1] = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); // Try to create a POA with invalid policies. Should throw an // exception. poa_creation_exception_test (root_poa.in (), poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); // Two policies for the next POA. poa_policy_list.length (2); @@ -460,21 +435,18 @@ main (int argc, char *argv[]) // Create a priority model policy. poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Create a thread-pool policy. poa_policy_list[1] = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); // Create POA with CLIENT_PROPAGATED priority model, with lanes // but no bands. PortableServer::POA_var client_propagated_poa = root_poa->create_POA ("client_propagated_poa", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); // Three policies for the next POA. poa_policy_list.length (3); @@ -486,26 +458,22 @@ main (int argc, char *argv[]) // Create a priority model policy. poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, - poa_priority - ACE_ENV_ARG_PARAMETER); + poa_priority); // Create a bands policy. poa_policy_list[1] = - rt_orb->create_priority_banded_connection_policy (bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (bands); // Create a thread-pool policy. poa_policy_list[2] = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); // Create POA with SERVER_DECLARED priority model, with bands // and lanes. PortableServer::POA_var server_declared_poa = root_poa->create_POA ("server_declared_poa", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); // Test: Attempt to register an object with priority that // doesn't match lanes. Should get BAD_PARAM exception. @@ -513,36 +481,31 @@ main (int argc, char *argv[]) "\n<---Test--->: Servant priority does not match lanes\n\n")); RTPortableServer::POA_var rt_server_declared_poa = - RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (server_declared_poa.in ()); // Activation with incorrect priority should fail. CORBA::Short wrong_priority = 10000; object_activation_exception_test (rt_server_declared_poa.in (), 0, - wrong_priority - ACE_ENV_ARG_PARAMETER); + wrong_priority); // Create first servant and register with <client_propagated_poa>. Test_i server_impl (orb.in (), - bands - ACE_ENV_ARG_PARAMETER); + bands); result = create_object (client_propagated_poa.in (), orb.in (), &server_impl, - ior_output_file1 - ACE_ENV_ARG_PARAMETER); + ior_output_file1); if (result != 0) return result; // Create second servant and register with <server_declared_poa>. Test_i server_impl2 (orb.in (), - bands - ACE_ENV_ARG_PARAMETER); + bands); result = create_object (server_declared_poa.in (), orb.in (), &server_impl2, - ior_output_file2 - ACE_ENV_ARG_PARAMETER); + ior_output_file2); if (result != 0) return result; @@ -555,7 +518,7 @@ main (int argc, char *argv[]) // Destroy ORB. orb->destroy (); } - ACE_CATCH (CORBA::INTERNAL, exception) + catch (const CORBA::INTERNAL& exception) { int minor_code = exception.minor (); @@ -583,13 +546,12 @@ main (int argc, char *argv[]) // Unexpected error. ACE_ASSERT (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Banded_Connections test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in Banded_Connections test server:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index d2efbb0bec5..5c4740ebcc8 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -14,16 +14,14 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41,7 +39,6 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); } diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index 569419fb346..c232ee05e1a 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 8716992f0a0..87af90bca4c 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -60,13 +60,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); Test_var server = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -79,11 +79,10 @@ Task::svc (void) // Check that the object is configured with CLIENT_PROPAGATED // PriorityModelPolicy. CORBA::Policy_var policy = - server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE); RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); if (CORBA::is_nil (priority_policy.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -102,15 +101,13 @@ Task::svc (void) // Make several invocation, changing the priority of this thread // for each. object = - this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); - object = this->orb_->resolve_initial_references ("PriorityMappingManager" - ACE_ENV_ARG_PARAMETER); + object = this->orb_->resolve_initial_references ("PriorityMappingManager"); RTCORBA::PriorityMappingManager_var mapping_manager = - RTCORBA::PriorityMappingManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityMappingManager::_narrow (object.in ()); RTCORBA::PriorityMapping *pm = mapping_manager->mapping (); @@ -136,7 +133,7 @@ Task::svc (void) for (int i = 0; i < 3; ++i) { - current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER); + current->the_priority (desired_priority); CORBA::Short priority = current->the_priority (); @@ -148,7 +145,7 @@ Task::svc (void) -1); - server->test_method (priority ACE_ENV_ARG_PARAMETER); + server->test_method (priority); desired_priority++; } @@ -156,20 +153,17 @@ Task::svc (void) // Shut down Server ORB. server->shutdown (); } - ACE_CATCH (CORBA::DATA_CONVERSION, ex) + catch (const CORBA::DATA_CONVERSION& ex) { - ACE_PRINT_EXCEPTION(ex, - "Most likely, this is due to the in-ability " - "to set the thread priority."); + ex._tao_print_exception ( + "Most likely, this is due to the in-ability ""to set the thread priority."); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } @@ -177,7 +171,7 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Register the interceptors to check for the RTCORBA // service contexts in the reply messages. @@ -189,12 +183,11 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return -1; @@ -241,13 +234,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index a53b6cd45ef..5b6980c223a 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -34,8 +34,7 @@ Client_Request_Interceptor::destroy (void) void Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -43,8 +42,7 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -53,35 +51,31 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { // 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); + ri->get_reply_service_context (IOP::RTCorbaPriority); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); ACE_DEBUG ((LM_DEBUG, "EXCEPTION was most likely caused by the lack " "of an IOP::RTCorbaPriority context in the reply.\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } void Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -89,8 +83,7 @@ Client_Request_Interceptor::receive_other ( void Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -99,8 +92,7 @@ Client_Request_Interceptor::receive_exception ( { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); } CORBA::String_var operation = ri->operation (); @@ -108,7 +100,7 @@ Client_Request_Interceptor::receive_exception ( CORBA::Object_var target = ri->target (); CORBA::String_var ior = - this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in ()); ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -120,5 +112,5 @@ Client_Request_Interceptor::receive_exception ( // 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); + ri->get_reply_service_context (IOP::RTCorbaPriority); } diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 9f4118b2dd7..83872792775 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -39,26 +39,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 4faab819821..9c134b8a815 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -18,8 +18,7 @@ public: // ctor // = The Test methods. - void test_method (CORBA::Short priority - ACE_ENV_ARG_DECL_NOT_USED) + void test_method (CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -36,21 +35,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (CORBA::Short priority - ACE_ENV_ARG_DECL) +Test_i::test_method (CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // Use RTCurrent to find out the CORBA priority of the current // thread. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in ()); if (CORBA::is_nil (obj.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); CORBA::Short servant_thread_priority = current->the_priority (); @@ -71,7 +69,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -128,13 +126,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,14 +142,13 @@ Task::svc (void) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + object = this->orb_->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); // Create POA with CLIENT_PROPAGATED PriorityModelPolicy, // and register Test object with it. @@ -159,27 +156,24 @@ Task::svc (void) poa_policy_list.length (1); poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); Test_i server_impl (this->orb_.in ()); PortableServer::ObjectId_var id = - child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); + child_poa->activate_object (&server_impl); CORBA::Object_var server = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); // Print Object IOR. CORBA::String_var ior = - this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -222,13 +216,11 @@ Task::svc (void) " = its initial priority\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -236,13 +228,13 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Standard initialization: // parse arguments and get all the references (ORB, // RootPOA, RTORB, RTCurrent, POAManager). CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return -1; @@ -289,12 +281,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 3fd1935a8d9..2ab8589eeef 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -64,36 +64,34 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) void exception_test (Test_ptr server, - const char *msg - ACE_ENV_ARG_DECL) + const char *msg) { - ACE_TRY + try { server->test_method (); } - ACE_CATCH (CORBA::INV_POLICY, ex) + catch (const CORBA::INV_POLICY& ) { ACE_DEBUG ((LM_DEBUG, "INV_POLICY exception is caught as expected.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, msg)); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -101,39 +99,36 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyManager. - object = orb->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); if (check_for_nil (policy_manager.in (), "PolicyManager") == -1) return -1; // PolicyCurrent. - object = orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); 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); - Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior1); + Test_var server1 = Test::_narrow (object.in ()); 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); - Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2); + Test_var server2 = Test::_narrow (object.in ()); if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -162,15 +157,13 @@ main (int argc, char *argv[]) CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); exception_test (server1.in (), - "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER); + "ERROR: Test 2 failed\n"); // Test 3: Attempt the invocation on the second object reference // (the one that didn't have ClientProtocolPolicy set on the @@ -194,15 +187,13 @@ main (int argc, char *argv[]) protocols[1].protocol_type = 4; protocols[2].protocol_type = 5; policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); exception_test (server2.in (), - "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER); + "ERROR: Test 4 failed\n"); // Test 5: Override ClientProtocolPolicy on the Current level // again. This time use the sequence in which the first @@ -214,12 +205,10 @@ main (int argc, char *argv[]) protocols[0].protocol_type = 3; protocols[1].protocol_type = protocol_type; policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); server2->test_method (); @@ -232,13 +221,12 @@ main (int argc, char *argv[]) // see Bug 1197 for details. ACE_OS::sleep (5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in ClientProtocolPolicy test client:"); + ex._tao_print_exception ( + "Unexpected exception caught in ClientProtocolPolicy test client:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 66a6c7f0538..28137e09aa0 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) +Test_i::test_method ( /**/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -46,7 +46,7 @@ Test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down \n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -114,20 +114,18 @@ int create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); + poa->activate_object (server_impl); CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -150,11 +148,11 @@ create_object (PortableServer::POA_ptr poa, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -162,17 +160,16 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; @@ -194,14 +191,12 @@ main (int argc, char *argv[]) CORBA::PolicyList poa_policy_list; poa_policy_list.length (1); poa_policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); PortableServer::POA_var poa = root_poa->create_POA ("Child_POA", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); // Servant. Test_i server_impl (orb.in ()); @@ -210,14 +205,14 @@ main (int argc, char *argv[]) int result; ACE_DEBUG ((LM_DEBUG, "\nActivated object one as ")); result = create_object (poa.in (), orb.in (), &server_impl, - ior_output_file1 ACE_ENV_ARG_PARAMETER); + ior_output_file1); if (result == -1) return -1; // Create object 2. 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); + ior_output_file2); if (result == -1) return -1; @@ -228,13 +223,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in ClientProtocolPolicy: test server"); + ex._tao_print_exception ( + "Unexpected exception caught in ClientProtocolPolicy: test server"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index 73d2e5eb3c6..efbdd6407a8 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -26,16 +26,14 @@ typedef ACE_Array_Base<Test_Object_And_Servant> Tests; void setup_test_parameters (Test_Object_And_Servant *test, RTCORBA::Current_ptr current, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL); + CORBA::ORB_ptr orb); class test_i : public POA_test { public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - Tests &tests - ACE_ENV_ARG_DECL); + Tests &tests); void start (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -99,8 +97,7 @@ private: test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - Tests &tests - ACE_ENV_ARG_DECL) + Tests &tests) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)), tests_ (tests), @@ -111,12 +108,10 @@ test_i::test_i (CORBA::ORB_ptr orb, invocation_priority_ (0) { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); this->current_ = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); } int @@ -231,22 +226,18 @@ test_i::start (void) setup_test_parameters (test, this->current_.in (), - this->orb_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_.in ()); test->object_->method (); CORBA::String_var ior = - this->orb_->object_to_string (test->object_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (test->object_.in ()); CORBA::Object_var object = - this->orb_->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior.in ()); test_var test_from_string = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); test_from_string->method (); @@ -311,8 +302,7 @@ test_i::_default_POA (void) void setup_test_parameters (Test_Object_And_Servant *test, RTCORBA::Current_ptr current, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + CORBA::ORB_ptr orb) { CORBA::Short current_thread_priority = current->the_priority (); @@ -365,17 +355,14 @@ setup_test_parameters (Test_Object_And_Servant *test, class Server { public: - Server (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL); + Server (CORBA::ORB_ptr orb); 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 - ACE_ENV_ARG_DECL); + RTCORBA::PriorityModel priority_model); void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, - RTCORBA::PriorityModel priority_model - ACE_ENV_ARG_DECL); + RTCORBA::PriorityModel priority_model); void test (void); void start_testing (void); void shutdown (void); @@ -397,8 +384,7 @@ public: CORBA::ULong max_request_buffer_size_; }; -Server::Server (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) +Server::Server (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), stacksize_ (0), static_threads_ (1), @@ -409,31 +395,25 @@ Server::Server (CORBA::ORB_ptr orb max_request_buffer_size_ (0) { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); this->rt_orb_ = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); this->current_ = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); default_thread_priority = this->current_->the_priority (); object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); this->root_poa_ = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); this->poa_manager_ = this->root_poa_->the_POAManager (); @@ -448,8 +428,7 @@ Server::create_servant_in_root_poa (void) ACE_NEW_THROW_EX (servant, test_i (this->orb_.in (), this->root_poa_.in (), - this->tests_ - ACE_ENV_ARG_PARAMETER), + this->tests_), CORBA::NO_MEMORY ()); servant->invocation_pool_and_lane (0, 0); @@ -468,8 +447,7 @@ Server::create_servant_in_root_poa (void) void Server::create_poa_and_servant_with_tp_policy (const char *poa_name, int set_priority_model, - RTCORBA::PriorityModel priority_model - ACE_ENV_ARG_DECL) + RTCORBA::PriorityModel priority_model) { RTCORBA::ThreadpoolId threadpool_id = this->rt_orb_->create_threadpool (this->stacksize_, @@ -478,17 +456,14 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, default_thread_priority, this->allow_request_buffering_, this->max_buffered_requests_, - this->max_request_buffer_size_ - ACE_ENV_ARG_PARAMETER); + this->max_request_buffer_size_); CORBA::Policy_var threadpool_policy = - this->rt_orb_->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_threadpool_policy (threadpool_id); CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); CORBA::PolicyList policies; @@ -506,19 +481,16 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, PortableServer::POA_var poa = this->root_poa_->create_POA (poa_name, this->poa_manager_.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (poa.in () - ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (poa.in ()); test_i *servant1 = 0; ACE_NEW_THROW_EX (servant1, test_i (this->orb_.in (), poa.in (), - this->tests_ - ACE_ENV_ARG_PARAMETER), + this->tests_), CORBA::NO_MEMORY ()); servant1->in_lane (0); @@ -533,8 +505,7 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, servant1->client_propagated (1); id1 = - rt_poa->activate_object (servant1 - ACE_ENV_ARG_PARAMETER); + rt_poa->activate_object (servant1); } else { @@ -543,8 +514,7 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, ACE_NEW_THROW_EX (servant2, test_i (this->orb_.in (), poa.in (), - this->tests_ - ACE_ENV_ARG_PARAMETER), + this->tests_), CORBA::NO_MEMORY ()); servant2->in_lane (0); @@ -562,22 +532,18 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, id1 = rt_poa->activate_object_with_priority (servant1, - default_thread_priority + 1 - ACE_ENV_ARG_PARAMETER); + default_thread_priority + 1); id2 = rt_poa->activate_object_with_priority (servant2, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); CORBA::Object_var object2 = - poa->id_to_reference (id2.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id2.in ()); this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = - test::_narrow (object2.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object2.in ()); this->tests_[this->tests_.size () - 1].servant_ = servant2; } @@ -587,28 +553,24 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name, servant1->invocation_pool_and_lane (3, 0); id1 = - rt_poa->activate_object (servant1 - ACE_ENV_ARG_PARAMETER); + rt_poa->activate_object (servant1); } PortableServer::ServantBase_var safe_servant (servant1); CORBA::Object_var object1 = - poa->id_to_reference (id1.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id1.in ()); this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = - test::_narrow (object1.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object1.in ()); this->tests_[this->tests_.size () - 1].servant_ = servant1; } void Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, - RTCORBA::PriorityModel priority_model - ACE_ENV_ARG_DECL) + RTCORBA::PriorityModel priority_model) { RTCORBA::ThreadpoolLanes lanes (2); lanes.length (2); @@ -627,17 +589,14 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->allow_borrowing_, this->allow_request_buffering_, this->max_buffered_requests_, - this->max_request_buffer_size_ - ACE_ENV_ARG_PARAMETER); + this->max_request_buffer_size_); CORBA::Policy_var threadpool_policy = - this->rt_orb_->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_threadpool_policy (threadpool_id); CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); CORBA::PolicyList policies; @@ -652,19 +611,16 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, PortableServer::POA_var poa = this->root_poa_->create_POA (poa_name, this->poa_manager_.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (poa.in () - ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (poa.in ()); test_i *servant1 = 0; ACE_NEW_THROW_EX (servant1, test_i (this->orb_.in (), poa.in (), - this->tests_ - ACE_ENV_ARG_PARAMETER), + this->tests_), CORBA::NO_MEMORY ()); servant1->in_lane (1); @@ -679,8 +635,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, servant1->client_propagated (1); id1 = - rt_poa->activate_object (servant1 - ACE_ENV_ARG_PARAMETER); + rt_poa->activate_object (servant1); } else { @@ -689,8 +644,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, ACE_NEW_THROW_EX (servant2, test_i (this->orb_.in (), poa.in (), - this->tests_ - ACE_ENV_ARG_PARAMETER), + this->tests_), CORBA::NO_MEMORY ()); servant2->in_lane (1); @@ -708,34 +662,28 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, id1 = rt_poa->activate_object_with_priority (servant1, - default_thread_priority + 1 - ACE_ENV_ARG_PARAMETER); + default_thread_priority + 1); id2 = rt_poa->activate_object_with_priority (servant2, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); CORBA::Object_var object2 = - poa->id_to_reference (id2.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id2.in ()); this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = - test::_narrow (object2.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object2.in ()); this->tests_[this->tests_.size () - 1].servant_ = servant2; } CORBA::Object_var object1 = - poa->id_to_reference (id1.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id1.in ()); this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = - test::_narrow (object1.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object1.in ()); this->tests_[this->tests_.size () - 1].servant_ = servant1; } @@ -751,8 +699,7 @@ Server::start_testing (void) setup_test_parameters (test, this->current_.in (), - this->orb_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_.in ()); test->object_->start (); @@ -768,8 +715,7 @@ Server::test (void) 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); + this->current_->the_priority (default_thread_priority + 1); this->start_testing (); } @@ -777,7 +723,7 @@ Server::test (void) void Server::shutdown (void) { - this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (1); this->orb_->destroy (); } @@ -805,47 +751,39 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { - Server server (this->orb_.in () - ACE_ENV_ARG_PARAMETER); + Server server (this->orb_.in ()); 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); + RTCORBA::CLIENT_PROPAGATED); server.create_poa_and_servant_with_tp_policy ("tp_server_declared_poa", 1, - RTCORBA::SERVER_DECLARED - ACE_ENV_ARG_PARAMETER); + RTCORBA::SERVER_DECLARED); server.create_poa_and_servant_with_tp_policy ("tp_no_priority_model_poa", 0, - RTCORBA::CLIENT_PROPAGATED - ACE_ENV_ARG_PARAMETER); + RTCORBA::CLIENT_PROPAGATED); server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa", - RTCORBA::CLIENT_PROPAGATED - ACE_ENV_ARG_PARAMETER); + RTCORBA::CLIENT_PROPAGATED); server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa", - RTCORBA::SERVER_DECLARED - ACE_ENV_ARG_PARAMETER); + RTCORBA::SERVER_DECLARED); server.test (); server.shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -853,13 +791,12 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Make sure we can support multiple priorities that are // required for this test. @@ -903,13 +840,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } 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 88f7b6bb573..d934d699c75 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -43,8 +43,7 @@ parse_args (int argc, char *argv[]) } RTCORBA::ThreadpoolId -create_threadpool (RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) +create_threadpool (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::ThreadpoolId id = rt_orb->create_threadpool (stacksize, @@ -53,15 +52,13 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); return id; } RTCORBA::ThreadpoolId -create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) +create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::ThreadpoolLanes lanes (2); lanes.length (2); @@ -80,8 +77,7 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); return id; } @@ -89,29 +85,24 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - orb->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); default_thread_priority = current->the_priority (); @@ -127,29 +118,23 @@ main (int argc, char *argv[]) ++i) { RTCORBA::ThreadpoolId id = - create_threadpool (rt_orb.in () - ACE_ENV_ARG_PARAMETER); + create_threadpool (rt_orb.in ()); - rt_orb->destroy_threadpool (id - ACE_ENV_ARG_PARAMETER); + rt_orb->destroy_threadpool (id); id = - create_threadpool_with_lanes (rt_orb.in () - ACE_ENV_ARG_PARAMETER); + create_threadpool_with_lanes (rt_orb.in ()); - rt_orb->destroy_threadpool (id - ACE_ENV_ARG_PARAMETER); + rt_orb->destroy_threadpool (id); } orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 9c6d8d9cc3f..c2eafe73c8d 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -26,14 +26,13 @@ change_network_priority (int enable_network_priority, Test_var &server, CORBA::ORB_ptr orb) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); // Set the tcp protocol protperties RTCORBA::TCPProtocolProperties_var tcp_properties = @@ -42,8 +41,7 @@ change_network_priority (int enable_network_priority, 1, 0, 1, - enable_network_priority - ACE_ENV_ARG_PARAMETER); + enable_network_priority); RTCORBA::ProtocolList protocols; protocols.length (1); @@ -56,23 +54,20 @@ change_network_priority (int enable_network_priority, CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); switch (level) { // Change policy at ORB level case ORB: { - object = orb->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); break; } @@ -81,15 +76,13 @@ change_network_priority (int enable_network_priority, case THREAD: { object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); break; } @@ -98,21 +91,18 @@ change_network_priority (int enable_network_priority, case OBJECT: { CORBA::Object_var object = server->_set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + server = Test::_narrow (object.in ()); break; } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; } int @@ -173,29 +163,27 @@ toggle (int &i) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return -1; // Initialize and obtain reference to the Test object. CORBA::Object_var client_object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_var server = - Test::_narrow (client_object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (client_object.in ()); // Resolve the Network priority Mapping Manager CORBA::Object_var object = - orb->resolve_initial_references ("NetworkPriorityMappingManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NetworkPriorityMappingManager"); RTCORBA::NetworkPriorityMappingManager_var mapping_manager = - RTCORBA::NetworkPriorityMappingManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()); // Initialize the custom priority mapping Custom_Network_Priority_Mapping *cnpm = 0; @@ -242,13 +230,11 @@ main (int argc, char *argv[]) server->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index 98035dc47ef..076f959d777 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -42,7 +42,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } static const char *simple_servant_ior_file = "simple_servant.ior"; @@ -79,20 +79,17 @@ void create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, PortableServer::Servant servant, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (servant - ACE_ENV_ARG_PARAMETER); + poa->activate_object (servant); CORBA::Object_var object = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); CORBA::String_var ior = - orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object.in ()); FILE *output_file= ACE_OS::fopen (filename, "w"); ACE_OS::fprintf (output_file, "%s", ior.in ()); @@ -102,14 +99,13 @@ create_object (PortableServer::POA_ptr poa, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object; // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -117,11 +113,10 @@ main (int argc, char *argv[]) // RootPOA. object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // POAManager. PortableServer::POAManager_var poa_manager = @@ -134,16 +129,13 @@ main (int argc, char *argv[]) create_object (root_poa.in (), orb.in (), &servant, - simple_servant_ior_file - ACE_ENV_ARG_PARAMETER); + simple_servant_ior_file); object = - orb->resolve_initial_references ("NetworkPriorityMappingManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NetworkPriorityMappingManager"); RTCORBA::NetworkPriorityMappingManager_var mapping_manager = - RTCORBA::NetworkPriorityMappingManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()); Custom_Network_Priority_Mapping *cnpm = 0; ACE_NEW_RETURN (cnpm, @@ -156,12 +148,10 @@ main (int argc, char *argv[]) // RTORB. object = - orb->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); // Set transport protocol properties RTCORBA::TCPProtocolProperties_var tcp_properties = @@ -170,8 +160,7 @@ main (int argc, char *argv[]) 1, 0, 1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); RTCORBA::ProtocolList protocols; protocols.length (1); @@ -185,22 +174,19 @@ main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = - rt_orb->create_server_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_server_protocol_policy (protocols); // Create POA with Diffserv enabled PortableServer::POA_var poa_with_diffserv = root_poa->create_POA ("POA_WITH_DS", poa_manager.in (), - policy_list - ACE_ENV_ARG_PARAMETER); + policy_list); // Create object 2. create_object (poa_with_diffserv.in (), orb.in (), &servant, - diffserv_servant_ior_file - ACE_ENV_ARG_PARAMETER); + diffserv_servant_ior_file); // Activate POA manager. poa_manager->activate (); @@ -210,13 +196,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught:"); + ex._tao_print_exception ("Unexpected exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index 0f26de829f3..9570ad96270 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -75,13 +75,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); pid_t pid = ACE_OS::getpid (); @@ -94,8 +94,7 @@ Task::svc (void) CORBA::Long r = test->method (pid, i, - mtc - ACE_ENV_ARG_PARAMETER); + mtc); // Each 2 iterations sleep 5 seconds if (i % 2 == 0) @@ -126,8 +125,7 @@ Task::svc (void) CORBA::Long re = test->method (pid, 0, - end - ACE_ENV_ARG_PARAMETER); + end); ACE_ASSERT (re == 0); // Assert disappears on with optimizations on. @@ -143,13 +141,11 @@ Task::svc (void) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -157,10 +153,10 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); int result = parse_args (argc, argv); @@ -209,12 +205,11 @@ main (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: Number of threads didn't decrease\n"), -1); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index f1e665bb85d..384c3944762 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -59,12 +59,10 @@ parse_args (int argc, char *argv[]) int write_ior_to_file (CORBA::ORB_ptr orb, - test_ptr test - ACE_ENV_ARG_DECL) + test_ptr test) { CORBA::String_var ior = - orb->object_to_string (test - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -97,8 +95,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::POAManager_ptr poa_manager, PortableServer::POA_ptr root_poa, CORBA::ORB_ptr orb, - RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) + RTCORBA::RTORB_ptr rt_orb) { // Policies for the firstPOA to be created. CORBA::PolicyList policies (3); policies.length (3); @@ -106,8 +103,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Implicit_activation policy. policies[0] = root_poa->create_implicit_activation_policy - (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + (PortableServer::IMPLICIT_ACTIVATION); // Thread pool policy. policies[1] = @@ -116,15 +112,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Priority Model policy. policies[2] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Create the POA under the RootPOA. PortableServer::POA_var poa = root_poa->create_POA (poa_name, poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -147,8 +141,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, int result = write_ior_to_file (orb, - test.in () - ACE_ENV_ARG_PARAMETER); + test.in ()); return result; } @@ -176,34 +169,28 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); RTCORBA::Priority default_thread_priority = current->the_priority (); @@ -216,8 +203,7 @@ Task::svc (void) int result = write_ior_to_file (this->orb_.in (), - test.in () - ACE_ENV_ARG_PARAMETER); + test.in ()); if (result != 0) return result; @@ -236,12 +222,10 @@ Task::svc (void) default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_1 = - rt_orb->create_threadpool_policy (threadpool_id_1 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_1); CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (1); @@ -257,12 +241,10 @@ Task::svc (void) allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_2 = - rt_orb->create_threadpool_policy (threadpool_id_2 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_2); result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -270,8 +252,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -281,8 +262,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -290,13 +270,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -304,13 +282,12 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); int result = parse_args (argc, argv); @@ -359,12 +336,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index 70925240498..231ed2d2f02 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -20,8 +20,7 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Long test_i::method (CORBA::Long client_id, CORBA::Long iteration, - CORBA::Long_out thread_count - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long_out thread_count) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. @@ -65,6 +64,5 @@ void test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h index c97381b3e02..dbceb65c9ab 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h @@ -22,8 +22,7 @@ public: /// Test method. CORBA::Long method (CORBA::Long client_id, CORBA::Long iteration, - CORBA::Long_out thread_count - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long_out thread_count) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 7ad8531b54b..1ef938988dd 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -48,13 +48,13 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB, parse arguments, and resolve references. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -62,24 +62,22 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyCurrent. - object = orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return -1; // Test object. - object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior); + Test_var server = Test::_narrow (object.in ()); if (check_for_nil (server.in (), "server") == -1) return -1; @@ -100,19 +98,16 @@ main (int argc, char *argv[]) CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); ACE_DEBUG ((LM_DEBUG, "\n Test 1\n")); CORBA::PolicyList_var pols; - int status = server->_validate_connection (pols.out () - ACE_ENV_ARG_PARAMETER); + int status = server->_validate_connection (pols.out ()); if (!status) ACE_DEBUG ((LM_DEBUG, @@ -138,15 +133,12 @@ main (int argc, char *argv[]) protocols[0].protocol_type = TAO_TAG_UIOP_PROFILE; policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - status = server->_validate_connection (pols.out () - ACE_ENV_ARG_PARAMETER); + status = server->_validate_connection (pols.out ()); if (status) ACE_DEBUG ((LM_DEBUG, @@ -171,12 +163,10 @@ main (int argc, char *argv[]) // Testing over. Shut down Server ORB. protocols[0].protocol_type = TAO_TAG_SHMEM_PROFILE; policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); ACE_DEBUG ((LM_DEBUG, "\n Testing over - shutting down\n")); @@ -185,13 +175,12 @@ main (int argc, char *argv[]) ACE_OS::sleep (2); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Explicit_Binding test client:"); + ex._tao_print_exception ( + "Unexpected exception caught in Explicit_Binding test client:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 385adec4426..eb3ba8daff6 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -34,7 +34,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method (/* */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -95,21 +95,19 @@ int create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); + poa->activate_object (server_impl); CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -132,11 +130,11 @@ create_object (PortableServer::POA_ptr poa, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -144,9 +142,9 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; @@ -162,8 +160,7 @@ main (int argc, char *argv[]) result = create_object (root_poa.in (), orb.in (), &server_impl, - ior_output_file - ACE_ENV_ARG_PARAMETER); + ior_output_file); if (result == -1) return -1; @@ -174,13 +171,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Explicit_Binding test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in Explicit_Binding test server:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index b065dd6271c..91a198ab76b 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -108,38 +108,35 @@ Worker_Thread::validate_connection (void) int current_attempt = 0; for (;;) { - ACE_TRY + try { ++current_attempt; - this->test_->_validate_connection (inconsistent_policies.out () - ACE_ENV_ARG_PARAMETER); + this->test_->_validate_connection (inconsistent_policies.out ()); // If successful, we are done. return; } - ACE_CATCH (CORBA::TRANSIENT, exception) + catch (const CORBA::TRANSIENT& ) { // If we have reach our maximum number of tries, throw exception. if (current_attempt == max_attempts) - ACE_RE_THROW; + throw; // Otherwise, ignore... } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Rethrow any other exceptions. - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } int Worker_Thread::svc (void) { - ACE_TRY_NEW_ENV + try { - this->current_->the_priority (this->priority_ - ACE_ENV_ARG_PARAMETER); + this->current_->the_priority (this->priority_); this->validate_connection (); @@ -148,12 +145,10 @@ Worker_Thread::svc (void) this->test_->method (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Worker Thread exception:"); + ex._tao_print_exception ("Worker Thread exception:"); } - ACE_ENDTRY; return 0; } @@ -180,42 +175,33 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); - current->the_priority (0 - ACE_ENV_ARG_PARAMETER); + current->the_priority (0); object = - this->orb_->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); object = - this->orb_->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); ULong_Array priorities; int result = @@ -234,14 +220,12 @@ Task::svc (void) bands_file, rt_orb.in (), policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) return result; policy_manager->set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); u_long i = 0; @@ -292,12 +276,11 @@ Task::svc (void) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!"); + ex._tao_print_exception ("Unexpected exception!"); return -1; } - ACE_ENDTRY; return 0; } @@ -305,13 +288,12 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -360,12 +342,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!"); + ex._tao_print_exception ("Unexpected exception!"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 98b4974ab6d..c48b57143ca 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -51,8 +51,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr @@ -114,16 +113,14 @@ parse_args (int argc, char **argv) static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { FILE *file = ACE_OS::fopen (filename, "w"); ACE_ASSERT (file != 0); CORBA::String_var ior = - orb->object_to_string (object - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object); u_int result = 0; result = @@ -160,23 +157,19 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -188,8 +181,7 @@ Task::svc (void) bands_file, rt_orb.in (), policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) return result; @@ -205,20 +197,17 @@ Task::svc (void) max_request_buffer_size, allow_borrowing, policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) return result; CORBA::Policy_var priority_model_policy = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Implicit_activation policy. CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -231,8 +220,7 @@ Task::svc (void) PortableServer::POA_var poa = root_poa->create_POA ("child", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -247,8 +235,7 @@ Task::svc (void) write_iors_to_file (test.in (), this->orb_.in (), - ior - ACE_ENV_ARG_PARAMETER); + ior); poa_manager->activate (); @@ -256,12 +243,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } @@ -269,13 +255,12 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -324,12 +309,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 27def4d9f77..44c955037cf 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -163,15 +163,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { // Priority Mapping Manager. CORBA::Object_var object = - this->orb_->resolve_initial_references ("PriorityMappingManager" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("PriorityMappingManager"); RTCORBA::PriorityMappingManager_var mapping_manager = - RTCORBA::PriorityMappingManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityMappingManager::_narrow (object.in ()); if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1) return -1; @@ -180,27 +178,26 @@ Task::svc (void) // RTCurrent. object = - this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); 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); - Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); + Test_var server = Test::_narrow (object.in ()); if (check_for_nil (server.in (), "Test object") == -1) return -1; // Check that test object is configured with CLIENT_PROPAGATED // PriorityModelPolicy. CORBA::Policy_var policy = - server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE); RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; @@ -265,16 +262,15 @@ 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); + current->the_priority (priority1); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in MT_Client_Protocol_Priority test client:"); + ex._tao_print_exception ( + "Unexpected exception in MT_Client_Protocol_Priority test client:"); return -1; } - ACE_ENDTRY; return 0; } @@ -282,13 +278,13 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -336,13 +332,12 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in MT_Client_Protocol_Priority test client:"); + ex._tao_print_exception ( + "Unexpected exception in MT_Client_Protocol_Priority test client:"); return -1; } - ACE_ENDTRY; return 0; } @@ -363,22 +358,20 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb, int Worker_Thread::svc (void) { - ACE_TRY_NEW_ENV + try { // RTORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 0; // PolicyCurrent. object = - this->orb_->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return 0; @@ -395,12 +388,10 @@ Worker_Thread::svc (void) CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); // Wait for other threads. this->synchronizer_->wait (); @@ -411,11 +402,9 @@ Worker_Thread::svc (void) this->server_->test_method (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Worker Thread exception:"); + ex._tao_print_exception ("Worker Thread exception:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index fde1982564a..d54be8f5548 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -35,7 +35,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method ( /* */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_method invoked\n")); @@ -45,7 +45,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -114,21 +114,20 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { // RTORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; @@ -141,28 +140,25 @@ Task::svc (void) poa_policy_list.length (1); poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); // Create object. Test_i server_impl (this->orb_.in ()); PortableServer::ObjectId_var id = - child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); + child_poa->activate_object (&server_impl); CORBA::Object_var server = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); // Print Object IOR. CORBA::String_var ior = - this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -186,13 +182,12 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in MT_Client_Protocol_Priority test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in MT_Client_Protocol_Priority test server:"); return -1; } - ACE_ENDTRY; return 0; } @@ -200,11 +195,11 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -252,12 +247,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp index a078e2cd10e..b0f03a3e6a5 100644 --- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp +++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp @@ -19,7 +19,7 @@ test_multiple_orbs (const char *test_name, RTCORBA::RTORB_var *rt_orbs = new RTCORBA::RTORB_var[iterations]; - ACE_TRY_NEW_ENV + try { for (int i = 0; i < iterations; @@ -31,18 +31,15 @@ test_multiple_orbs (const char *test_name, orbs[i] = CORBA::ORB_init (argc, argv, - name - ACE_ENV_ARG_PARAMETER); + name); if (rt_orb) { CORBA::Object_var object = - orbs[i]->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orbs[i]->resolve_initial_references ("RTORB"); rt_orbs[i] = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ()); } @@ -58,13 +55,11 @@ test_multiple_orbs (const char *test_name, } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in ORB_init"); + ex._tao_print_exception ("Unexpected exception caught in ORB_init"); return -1; } - ACE_ENDTRY; delete[] rt_orbs; delete[] orbs; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index 8a28b1ac007..17818644116 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -52,13 +52,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -66,12 +65,10 @@ main (int argc, char **argv) return result; CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); if (CORBA::is_nil (test.in ())) { @@ -91,12 +88,11 @@ main (int argc, char **argv) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!"); + ex._tao_print_exception ("Unexpected exception!"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index a3837fc739e..e11d09b1640 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -49,8 +49,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr @@ -117,16 +116,14 @@ parse_args (int argc, char *argv[]) static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { FILE *file = ACE_OS::fopen (filename, "w"); ACE_ASSERT (file != 0); CORBA::String_var ior = - orb->object_to_string (object - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object); if (debug) ACE_DEBUG ((LM_DEBUG, @@ -149,18 +146,15 @@ write_iors_to_file (CORBA::Object_ptr object, void create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa, - PortableServer::POAManager_ptr poa_manager - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager) { CORBA::PolicyList policies; CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); CORBA::Policy_var lifespan_policy = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -173,8 +167,7 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, PortableServer::POA_var poa = root_poa->create_POA ("persistent_child", poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -189,16 +182,14 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, write_iors_to_file (test.in (), orb, - persistent_ior - ACE_ENV_ARG_PARAMETER); + persistent_ior); } void create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr root_poa, - PortableServer::POAManager_ptr poa_manager - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager) { RTCORBA::ThreadpoolId threadpool_id = rt_orb->create_threadpool (stacksize, @@ -207,16 +198,13 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); CORBA::PolicyList policies; @@ -231,8 +219,7 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, PortableServer::POA_var poa = root_poa->create_POA ("tp_child", poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -247,16 +234,14 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, write_iors_to_file (test.in (), orb, - transient_ior - ACE_ENV_ARG_PARAMETER); + transient_ior); } void create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr root_poa, - PortableServer::POAManager_ptr poa_manager - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager) { RTCORBA::ThreadpoolId threadpool_id = rt_orb->create_threadpool (stacksize, @@ -265,20 +250,16 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); CORBA::Policy_var lifespan_policy = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT); CORBA::PolicyList policies; @@ -297,8 +278,7 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, PortableServer::POA_var poa = root_poa->create_POA ("tp_persistent_child", poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -313,20 +293,18 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, write_iors_to_file (test.in (), orb, - tp_persistent_ior - ACE_ENV_ARG_PARAMETER); + tp_persistent_ior); } int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -334,31 +312,25 @@ main (int argc, char **argv) return result; CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - orb->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); default_thread_priority = current->the_priority (); object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -366,19 +338,16 @@ main (int argc, char **argv) create_poa_and_servant_with_tp_policy (orb.in (), rt_orb.in (), root_poa.in (), - poa_manager.in () - ACE_ENV_ARG_PARAMETER); + poa_manager.in ()); create_poa_and_servant_with_persistent_policy (orb.in (), root_poa.in (), - poa_manager.in () - ACE_ENV_ARG_PARAMETER); + poa_manager.in ()); create_poa_with_tp_and_persistent_policy (orb.in (), rt_orb.in (), root_poa.in (), - poa_manager.in () - ACE_ENV_ARG_PARAMETER); + poa_manager.in ()); poa_manager->activate (); @@ -386,7 +355,7 @@ main (int argc, char **argv) orb->destroy (); } - ACE_CATCH (CORBA::INTERNAL, ex) + catch (const CORBA::INTERNAL& ex) { if ((ex.minor() & 0x1F) == 9) { ACE_DEBUG ((LM_DEBUG, "You must be superuser to run " @@ -394,16 +363,15 @@ main (int argc, char **argv) return 0; } else { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index 0c38f923ca9..bfbb1fb858c 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -27,24 +27,20 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rtorb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); /* * The following code should be reenabled once the OMG spec has @@ -54,8 +50,7 @@ main (int argc, char **argv) { RTCORBA::PriorityModelPolicy_var policy1 = rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - RTCORBA::minPriority - ACE_ENV_ARG_PARAMETER); + RTCORBA::minPriority); CORBA::Any policy_value; policy_value <<= RTCORBA::CLIENT_PROPAGATED; @@ -63,12 +58,10 @@ main (int argc, char **argv) CORBA::Policy_var policy = orb->create_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::PriorityModelPolicy_var policy2 = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->priority_model () == policy2->priority_model ()); ACE_ASSERT (policy1->server_priority () == policy2->server_priority ()); @@ -80,20 +73,17 @@ main (int argc, char **argv) RTCORBA::ThreadpoolId poolid = 0; RTCORBA::ThreadpoolPolicy_var policy1 = - rtorb->create_threadpool_policy (poolid - ACE_ENV_ARG_PARAMETER); + rtorb->create_threadpool_policy (poolid); CORBA::Any policy_value; policy_value <<= poolid; CORBA::Policy_var policy = orb->create_policy (RTCORBA::THREADPOOL_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::ThreadpoolPolicy_var policy2 = - RTCORBA::ThreadpoolPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()); ACE_ASSERT (policy1->threadpool () == policy2->threadpool ()); } @@ -102,20 +92,17 @@ main (int argc, char **argv) RTCORBA::ProtocolList empty_protocols; RTCORBA::ServerProtocolPolicy_var policy1 = - rtorb->create_server_protocol_policy (empty_protocols - ACE_ENV_ARG_PARAMETER); + rtorb->create_server_protocol_policy (empty_protocols); CORBA::Any policy_value; policy_value <<= empty_protocols; CORBA::Policy_var policy = orb->create_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::ServerProtocolPolicy_var policy2 = - RTCORBA::ServerProtocolPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()); RTCORBA::ProtocolList_var protocols1 = policy1->protocols (); @@ -129,20 +116,17 @@ main (int argc, char **argv) RTCORBA::ProtocolList empty_protocols; RTCORBA::ClientProtocolPolicy_var policy1 = - rtorb->create_client_protocol_policy (empty_protocols - ACE_ENV_ARG_PARAMETER); + rtorb->create_client_protocol_policy (empty_protocols); CORBA::Any policy_value; policy_value <<= empty_protocols; CORBA::Policy_var policy = orb->create_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::ClientProtocolPolicy_var policy2 = - RTCORBA::ClientProtocolPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()); RTCORBA::ProtocolList_var protocols1 = policy1->protocols (); @@ -160,32 +144,27 @@ main (int argc, char **argv) CORBA::Policy_var policy = orb->create_policy (RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::PrivateConnectionPolicy_var policy2 = - RTCORBA::PrivateConnectionPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ()); } { RTCORBA::PriorityBands empty_priority_bands; RTCORBA::PriorityBandedConnectionPolicy_var policy1 = - rtorb->create_priority_banded_connection_policy (empty_priority_bands - ACE_ENV_ARG_PARAMETER); + rtorb->create_priority_banded_connection_policy (empty_priority_bands); CORBA::Any policy_value; policy_value <<= empty_priority_bands; CORBA::Policy_var policy = orb->create_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE, - policy_value - ACE_ENV_ARG_PARAMETER); + policy_value); RTCORBA::PriorityBandedConnectionPolicy_var policy2 = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()); RTCORBA::PriorityBands_var priority_bands1 = policy1->priority_bands (); @@ -200,12 +179,11 @@ main (int argc, char **argv) argv[0])); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index ca8a9719d14..d29036173e9 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -76,39 +76,33 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); default_thread_priority = current->the_priority (); object = - this->orb_->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); for (int i = 0; i < iterations; i++) { - current->the_priority (default_thread_priority - ACE_ENV_ARG_PARAMETER); + current->the_priority (default_thread_priority); CORBA::Short priority = test->method (); if (priority != TAO_INVALID_PRIORITY) { - current->the_priority (priority - ACE_ENV_ARG_PARAMETER); + current->the_priority (priority); test->prioritized_method (); } @@ -119,12 +113,11 @@ Task::svc (void) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!"); + ex._tao_print_exception ("Unexpected exception!"); return -1; } - ACE_ENDTRY; return 0; } @@ -132,13 +125,12 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -196,12 +188,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!"); + ex._tao_print_exception ("Unexpected exception!"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 89166031267..6030be5d764 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -61,12 +61,10 @@ test_i::prioritized_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); CORBA::Short priority = current->the_priority (); @@ -87,8 +85,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr @@ -142,16 +139,14 @@ parse_args (int argc, char **argv) static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { FILE *file = ACE_OS::fopen (filename, "w"); ACE_ASSERT (file != 0); CORBA::String_var ior = - orb->object_to_string (object - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object); u_int result = 0; result = @@ -179,57 +174,48 @@ public: typedef void (server::*test_function) (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_default_pool_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_bands_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_no_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_no_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL); + const char *test_name); void test_default_pool_no_bands_client_propagated_poa (void); @@ -292,8 +278,7 @@ server::test_root_poa (void) write_iors_to_file (test.in (), this->orb_.in (), - "root" - ACE_ENV_ARG_PARAMETER); + "root"); } void @@ -302,14 +287,12 @@ 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); + this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); PortableServer::POA_var poa = this->root_poa_->create_POA ("child", this->poa_manager_.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -326,23 +309,20 @@ server::test_child_poa (void) write_iors_to_file (test.in (), this->orb_.in (), - "child" - ACE_ENV_ARG_PARAMETER); + "child"); } void server::test_default_pool_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { CORBA::PolicyList empty_policies; (this->*function) (empty_policies, server_priority, client_priority, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void @@ -350,8 +330,7 @@ server::test_bands_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { RTCORBA::PriorityBands bands; bands.length (3); @@ -365,22 +344,19 @@ server::test_bands_poa (CORBA::PolicyList &policies, policies.length (policies.length () + 1); policies[policies.length () - 1] = - this->rt_orb_->create_priority_banded_connection_policy (bands - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_priority_banded_connection_policy (bands); (this->*function) (policies, server_priority, client_priority, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void server::test_no_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { RTCORBA::ThreadpoolId threadpool_id = this->rt_orb_->create_threadpool (stacksize, @@ -389,12 +365,10 @@ server::test_no_lanes_poa (CORBA::Short server_priority, default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy = - this->rt_orb_->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_threadpool_policy (threadpool_id); CORBA::PolicyList policies; policies.length (1); @@ -404,16 +378,14 @@ server::test_no_lanes_poa (CORBA::Short server_priority, (this->*function) (policies, server_priority, client_priority, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void server::test_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { RTCORBA::ThreadpoolLanes lanes; lanes.length (3); @@ -436,12 +408,10 @@ server::test_lanes_poa (CORBA::Short server_priority, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy = - this->rt_orb_->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + this->rt_orb_->create_threadpool_policy (threadpool_id); CORBA::PolicyList policies; policies.length (1); @@ -451,32 +421,27 @@ server::test_lanes_poa (CORBA::Short server_priority, (this->*function) (policies, server_priority, client_priority, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (poa.in () - ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (poa.in ()); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -489,32 +454,27 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, PortableServer::ServantBase_var safe_servant (servant); PortableServer::ObjectId_var id = - rt_poa->activate_object (servant - ACE_ENV_ARG_PARAMETER); + rt_poa->activate_object (servant); CORBA::Object_var object = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); write_iors_to_file (object.in (), this->orb_.in (), - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void server::test_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { this->test_bands_poa (policies, server_priority, client_priority, &server::test_no_bands_client_propagated_poa, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void @@ -523,8 +483,7 @@ 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); + "default_pool_no_bands_client_propagated"); } void @@ -533,8 +492,7 @@ 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); + "no_lanes_no_bands_client_propagated"); } void @@ -543,8 +501,7 @@ 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); + "lanes_no_bands_client_propagated"); } void @@ -553,8 +510,7 @@ 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); + "default_pool_bands_client_propagated"); } void @@ -563,8 +519,7 @@ 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); + "no_lanes_bands_client_propagated"); } void @@ -573,8 +528,7 @@ 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); + "lanes_bands_client_propagated"); } @@ -582,24 +536,20 @@ void server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, - default_thread_priority - ACE_ENV_ARG_PARAMETER); + default_thread_priority); PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (poa.in () - ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (poa.in ()); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -613,32 +563,27 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, PortableServer::ObjectId_var id = rt_poa->activate_object_with_priority (servant, - ::server_priority - ACE_ENV_ARG_PARAMETER); + ::server_priority); CORBA::Object_var object = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); write_iors_to_file (object.in (), this->orb_.in (), - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void server::test_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, - const char *test_name - ACE_ENV_ARG_DECL) + const char *test_name) { this->test_bands_poa (policies, server_priority, client_priority, &server::test_no_bands_server_declared_poa, - test_name - ACE_ENV_ARG_PARAMETER); + test_name); } void @@ -647,8 +592,7 @@ 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); + "default_pool_no_bands_server_declared"); } void @@ -657,8 +601,7 @@ 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); + "no_lanes_no_bands_server_declared"); } void @@ -667,8 +610,7 @@ 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); + "lanes_no_bands_server_declared"); } void @@ -677,8 +619,7 @@ 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); + "default_pool_bands_server_declared"); } void @@ -687,8 +628,7 @@ 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); + "no_lanes_bands_server_declared"); } void @@ -697,8 +637,7 @@ 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); + "lanes_bands_server_declared"); } class Task : public ACE_Task_Base @@ -724,15 +663,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); // The following sets the current thread to the lowest priority // for this scheduling policy. This will give us the biggest @@ -754,12 +691,10 @@ Task::svc (void) return result; object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); default_thread_priority = current->the_priority (); @@ -771,12 +706,10 @@ Task::svc (void) default_thread_priority + 5; object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -820,12 +753,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } @@ -833,13 +765,12 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -888,12 +819,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 850a1857e9b..e2417379d80 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -82,29 +82,25 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var rt_current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); RTCORBA::Priority default_thread_priority = rt_current->the_priority (); @@ -127,23 +123,19 @@ Task::svc (void) CORBA::PolicyList policies; policies.length (1); policies[0] = - rt_orb->create_priority_banded_connection_policy (bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (bands); object = test->_set_policy_overrides (policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); test = - test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); } - rt_current->the_priority (low_priority - ACE_ENV_ARG_PARAMETER); + rt_current->the_priority (low_priority); - test->initialize (iterations * 2 - ACE_ENV_ARG_PARAMETER); + test->initialize (iterations * 2); int i = 0; char iteration_description[BUFSIZ]; @@ -151,28 +143,23 @@ Task::svc (void) { ACE_OS::sprintf (iteration_description, "L:%02d", i); test->method (work, - iteration_description - ACE_ENV_ARG_PARAMETER); + iteration_description); } - rt_current->the_priority (high_priority - ACE_ENV_ARG_PARAMETER); + rt_current->the_priority (high_priority); for (i = 0; i != iterations; ++i) { ACE_OS::sprintf (iteration_description, "H:%02d", i); test->method (work, - iteration_description - ACE_ENV_ARG_PARAMETER); + iteration_description); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -180,10 +167,10 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); int result = parse_args (argc, argv); @@ -232,12 +219,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index dcd2b4a17d5..bdb6107a94c 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -58,12 +58,10 @@ parse_args (int argc, char *argv[]) int write_ior_to_file (CORBA::ORB_ptr orb, - test_ptr test - ACE_ENV_ARG_DECL) + test_ptr test) { CORBA::String_var ior = - orb->object_to_string (test - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -97,8 +95,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::POAManager_ptr poa_manager, PortableServer::POA_ptr root_poa, CORBA::ORB_ptr orb, - RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) + RTCORBA::RTORB_ptr rt_orb) { // Policies for the firstPOA to be created. CORBA::PolicyList policies (3); policies.length (3); @@ -106,8 +103,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Implicit_activation policy. policies[0] = root_poa->create_implicit_activation_policy - (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + (PortableServer::IMPLICIT_ACTIVATION); // Thread pool policy. policies[1] = @@ -116,15 +112,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Priority Model policy. policies[2] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Create the POA under the RootPOA. PortableServer::POA_var poa = root_poa->create_POA (poa_name, poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -148,8 +142,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, int const result = write_ior_to_file (orb, - test.in () - ACE_ENV_ARG_PARAMETER); + test.in ()); return result; } @@ -177,34 +170,28 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); RTCORBA::Priority default_thread_priority = current->the_priority (); @@ -226,12 +213,10 @@ Task::svc (void) low_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_1 = - rt_orb->create_threadpool_policy (threadpool_id_1 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_1); CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (2); @@ -251,12 +236,10 @@ Task::svc (void) allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_2 = - rt_orb->create_threadpool_policy (threadpool_id_2 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_2); int result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -264,8 +247,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -275,8 +257,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -284,13 +265,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -298,13 +277,12 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); int result = parse_args (argc, argv); @@ -353,12 +331,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } 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 a83c6442b0e..a7b56506f10 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -21,33 +21,28 @@ test_i::test_i (CORBA::ORB_ptr orb, current_iteration_ (0), total_iterations_ (0) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); this->rt_current_ = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); this->work_iterations_in_one_sec_ = this->estimate_iterations (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } void test_i::method (CORBA::ULong work, - const char * iteration - ACE_ENV_ARG_DECL) + const char * iteration) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. @@ -95,8 +90,7 @@ test_i::method (CORBA::ULong work, if (this->current_iteration_ == this->total_iterations_) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } } @@ -107,8 +101,7 @@ test_i::_default_POA (void) } void -test_i::initialize (CORBA::ULong total_iterations - ACE_ENV_ARG_DECL_NOT_USED) +test_i::initialize (CORBA::ULong total_iterations) ACE_THROW_SPEC ((CORBA::SystemException)) { this->total_iterations_ = total_iterations; 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 3d7bb55eb47..986f17c75e4 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h @@ -22,14 +22,12 @@ public: RTCORBA::Priority high_priority); /// Initialize the server. - void initialize (CORBA::ULong total_iterations - ACE_ENV_ARG_DECL) + void initialize (CORBA::ULong total_iterations) ACE_THROW_SPEC ((CORBA::SystemException)); /// Test method. void method (CORBA::ULong work, - const char *iteration - ACE_ENV_ARG_DECL) + const char *iteration) ACE_THROW_SPEC ((CORBA::SystemException)); /// Our POA. diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index 42e98aa72ad..23d1e298db5 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -51,13 +51,13 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -65,30 +65,28 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // PolicyCurrent. - object = orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return -1; // Test object 1. - object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior1); + Test_var server1 = Test::_narrow (object.in ()); if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2. - object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2); + Test_var server2 = Test::_narrow (object.in ()); if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -118,8 +116,7 @@ main (int argc, char *argv[]) rt_orb->create_private_connection_policy (); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); // Make four invocations on test objects again. This time, // since RTCORBA::PrivateConnectionPolicy is set, we expect a @@ -148,13 +145,12 @@ main (int argc, char *argv[]) "\n Testing over - shutting down\n")); server1->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Private_Connection test client:"); + ex._tao_print_exception ( + "Unexpected exception caught in Private_Connection test client:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 2f802f07872..2ad7c3ce16a 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method (/* */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -44,7 +44,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -100,21 +100,19 @@ int create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); + poa->activate_object (server_impl); CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -137,11 +135,11 @@ create_object (PortableServer::POA_ptr poa, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -149,9 +147,9 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; @@ -168,16 +166,14 @@ main (int argc, char *argv[]) result = create_object (root_poa.in (), orb.in (), &server_impl1, - ior_output_file1 - ACE_ENV_ARG_PARAMETER); + ior_output_file1); if (result == -1) return -1; result = create_object (root_poa.in (), orb.in (), &server_impl2, - ior_output_file2 - ACE_ENV_ARG_PARAMETER); + ior_output_file2); if (result == -1) return -1; @@ -188,13 +184,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Private_Connection test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in Private_Connection test server:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 247d0ba484f..e39f6b10935 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -107,14 +107,11 @@ public: void vanilla_invocations (void); - void priority_invocations (int debug - ACE_ENV_ARG_DECL); + void priority_invocations (int debug); - void set_client_protocols_policies (int debug - ACE_ENV_ARG_DECL); + void set_client_protocols_policies (int debug); - void set_priority_bands (int debug - ACE_ENV_ARG_DECL); + void set_priority_bands (int debug); void set_private_connection_policies (void); @@ -175,49 +172,44 @@ Worker_Thread::validate_connection (void) int current_attempt = 0; for (;;) { - ACE_TRY + try { ++current_attempt; - this->test_->_validate_connection (inconsistent_policies.out () - ACE_ENV_ARG_PARAMETER); + this->test_->_validate_connection (inconsistent_policies.out ()); // If successful, we are done. return; } - ACE_CATCH (CORBA::TRANSIENT, exception) + catch (const CORBA::TRANSIENT& ) { // If we have reach our maximum number of tries, throw exception. if (current_attempt == max_attempts) - ACE_RE_THROW; + throw; // Otherwise, ignore... } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Rethrow any other exceptions. - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } } int Worker_Thread::svc (void) { - ACE_TRY_NEW_ENV + try { - this->current_->the_priority (this->priority_ - ACE_ENV_ARG_PARAMETER); + this->current_->the_priority (this->priority_); this->validate_connection (); this->client_.vanilla_invocations (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Worker Thread exception:"); + ex._tao_print_exception ("Worker Thread exception:"); } - ACE_ENDTRY; return 0; } @@ -244,8 +236,7 @@ Client::vanilla_invocations (void) } void -Client::priority_invocations (int debug - ACE_ENV_ARG_DECL) +Client::priority_invocations (int debug) { ULong_Array priorities; int result = @@ -311,8 +302,7 @@ Client::priority_invocations (int debug } void -Client::set_client_protocols_policies (int debug - ACE_ENV_ARG_DECL) +Client::set_client_protocols_policies (int debug) { CORBA::PolicyList policies; @@ -321,8 +311,7 @@ Client::set_client_protocols_policies (int debug protocols_file, this->rt_orb_.in (), policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -332,13 +321,11 @@ Client::set_client_protocols_policies (int debug } this->policy_manager_->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); } void -Client::set_priority_bands (int debug - ACE_ENV_ARG_DECL) +Client::set_priority_bands (int debug) { CORBA::PolicyList policies; @@ -347,8 +334,7 @@ Client::set_priority_bands (int debug bands_file, this->rt_orb_.in (), policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -358,8 +344,7 @@ Client::set_priority_bands (int debug } this->policy_manager_->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); } void @@ -372,8 +357,7 @@ Client::set_private_connection_policies (void) this->rt_orb_->create_private_connection_policy (); this->policy_manager_->set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); } void @@ -382,8 +366,7 @@ Client::reset_policies (void) CORBA::PolicyList empty_policies; this->policy_manager_->set_policy_overrides (empty_policies, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); } class Task : public ACE_Task_Base @@ -409,42 +392,33 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); - current->the_priority (0 - ACE_ENV_ARG_PARAMETER); + current->the_priority (0); object = - this->orb_->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); Client client (test.in (), this->orb_.in (), @@ -460,8 +434,7 @@ Task::svc (void) client.reset_policies (); - client.set_client_protocols_policies (debug - ACE_ENV_ARG_PARAMETER); + client.set_client_protocols_policies (debug); client.vanilla_invocations (); @@ -471,32 +444,25 @@ Task::svc (void) client.reset_policies (); - client.set_priority_bands (debug - ACE_ENV_ARG_PARAMETER); + client.set_priority_bands (debug); - client.priority_invocations (debug - ACE_ENV_ARG_PARAMETER); + client.priority_invocations (debug); client.set_private_connection_policies (); - client.priority_invocations (debug - ACE_ENV_ARG_PARAMETER); + client.priority_invocations (debug); client.reset_policies (); - client.set_priority_bands (debug - ACE_ENV_ARG_PARAMETER); + client.set_priority_bands (debug); - client.set_client_protocols_policies (0 - ACE_ENV_ARG_PARAMETER); + client.set_client_protocols_policies (0); - client.priority_invocations (0 - ACE_ENV_ARG_PARAMETER); + client.priority_invocations (0); client.set_private_connection_policies (); - client.priority_invocations (debug - ACE_ENV_ARG_PARAMETER); + client.priority_invocations (debug); client.reset_policies (); @@ -505,12 +471,11 @@ Task::svc (void) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!"); + ex._tao_print_exception ("Error!"); return -1; } - ACE_ENDTRY; return 0; } @@ -518,15 +483,13 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int parse_args_result = parse_args (argc, argv); @@ -575,12 +538,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!"); + ex._tao_print_exception ("Error!"); return -1; } - ACE_ENDTRY; 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 31433ff9507..abd328de089 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -84,8 +84,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } PortableServer::POA_ptr @@ -139,8 +138,7 @@ parse_args (int argc, char **argv) static void write_iors_to_file (CORBA::Object_ptr object, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + CORBA::ORB_ptr orb) { char filename[BUFSIZ]; sprintf (filename, @@ -154,8 +152,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ASSERT (file != 0); CORBA::String_var ior = - orb->object_to_string (object - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (object); u_int result = 0; result = @@ -172,14 +169,12 @@ write_iors_to_file (CORBA::Object_ptr object, void vanilla_poa (CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa, - PortableServer::POAManager_ptr poa_manager - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager) { CORBA::PolicyList policies; CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -188,8 +183,7 @@ vanilla_poa (CORBA::ORB_ptr orb, PortableServer::POA_var poa = root_poa->create_POA ("child", poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -203,16 +197,14 @@ vanilla_poa (CORBA::ORB_ptr orb, servant->_this (); write_iors_to_file (test.in (), - orb - ACE_ENV_ARG_PARAMETER); + orb); } void rt_poa (CORBA::ORB_ptr orb, RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr root_poa, - PortableServer::POAManager_ptr poa_manager - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager) { CORBA::PolicyList policies; @@ -221,8 +213,7 @@ rt_poa (CORBA::ORB_ptr orb, bands_file, rt_orb, policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -243,8 +234,7 @@ rt_poa (CORBA::ORB_ptr orb, max_request_buffer_size, allow_borrowing, policies, - debug - ACE_ENV_ARG_PARAMETER); + debug); if (result != 0) { ACE_ERROR ((LM_ERROR, @@ -255,13 +245,11 @@ rt_poa (CORBA::ORB_ptr orb, CORBA::Policy_var priority_model_policy = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Implicit_activation policy. CORBA::Policy_var implicit_activation_policy = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -274,8 +262,7 @@ rt_poa (CORBA::ORB_ptr orb, PortableServer::POA_var poa = root_poa->create_POA ("rt_poa", poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -289,8 +276,7 @@ rt_poa (CORBA::ORB_ptr orb, servant->_this (); write_iors_to_file (test.in (), - orb - ACE_ENV_ARG_PARAMETER); + orb); } class Task : public ACE_Task_Base @@ -316,37 +302,31 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); vanilla_poa (this->orb_.in (), root_poa.in (), - poa_manager.in () - ACE_ENV_ARG_PARAMETER); + poa_manager.in ()); rt_poa (this->orb_.in (), rt_orb.in (), root_poa.in (), - poa_manager.in () - ACE_ENV_ARG_PARAMETER); + poa_manager.in ()); poa_manager->activate (); @@ -354,12 +334,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } @@ -367,13 +346,12 @@ Task::svc (void) int main (int argc, char **argv) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); int result = parse_args (argc, argv); @@ -422,12 +400,11 @@ main (int argc, char **argv) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index 861a42c745c..bf326a9dfb3 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -63,7 +63,7 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { // Test the basic interface of the RTCORBA::Mutex This test should // run even on platforms without thread support. - ACE_TRY_NEW_ENV + try { RTCORBA::Mutex_var my_mutex; @@ -77,16 +77,15 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb) my_mutex->unlock (); - rt_orb->destroy_mutex (my_mutex.in () ACE_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (my_mutex.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_mutex_simple()"); + ex._tao_print_exception ( + "Unexpected exception caught in test_mutex_simple()"); return -1; } - ACE_ENDTRY; return 0; } @@ -97,14 +96,14 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { // Test the basic interface of the named RTCORBA::Mutex(es) This // test should run even on platforms without thread support. - ACE_TRY_NEW_ENV + try { RTCORBA::Mutex_var larry_mutex1; RTCORBA::Mutex_var moe_mutex1; CORBA::Boolean created_flag; larry_mutex1 = rt_orb->create_named_mutex ("larry", - created_flag ACE_ENV_ARG_PARAMETER); + created_flag); if (created_flag != 1) ACE_ERROR_RETURN ((LM_ERROR, @@ -112,8 +111,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) -1); moe_mutex1 = rt_orb->create_named_mutex ("moe", - created_flag - ACE_ENV_ARG_PARAMETER); + created_flag); if (created_flag != 1) ACE_ERROR_RETURN ((LM_ERROR, @@ -128,8 +126,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::Mutex_var larry_mutex2; larry_mutex2 = rt_orb->create_named_mutex ("larry", - created_flag - ACE_ENV_ARG_PARAMETER); + created_flag); if (created_flag != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -151,8 +148,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) // test opening the mutex { RTCORBA::Mutex_var larry_mutex3; - larry_mutex3 = rt_orb->open_named_mutex ("larry" - ACE_ENV_ARG_PARAMETER); + larry_mutex3 = rt_orb->open_named_mutex ("larry"); // test the pointers... if (reinterpret_cast<void *> (larry_mutex1.in ()) @@ -171,17 +167,16 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) larry_mutex1->unlock (); - rt_orb->destroy_mutex (larry_mutex1.in () ACE_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (larry_mutex1.in ()); - rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (moe_mutex1.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_named_mutex_simple()"); + ex._tao_print_exception ( + "Unexpected exception caught in test_named_mutex_simple()"); return -1; } - ACE_ENDTRY; return 0; } @@ -193,27 +188,26 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb) // name isn't found. // This test should run even on platforms without thread support. - ACE_TRY_NEW_ENV + try { RTCORBA::Mutex_var larry_mutex1; - larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER); + larry_mutex1 = rt_orb->open_named_mutex ("larry"); ACE_ERROR_RETURN ((LM_ERROR, "Expected a MutexNotFound exception, but didn't get one.\n"), -1); } - ACE_CATCH (RTCORBA::RTORB::MutexNotFound, ex) + catch (const RTCORBA::RTORB::MutexNotFound& ex) { ACE_DEBUG ((LM_DEBUG, "Caught expected MutexNotFound exception.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_named_mutex_exception()"); + ex._tao_print_exception ( + "Unexpected exception caught in test_named_mutex_exception()"); return -1; } - ACE_ENDTRY; return 0; } @@ -240,7 +234,7 @@ mutex_test_thread (void *args) ACE_OS::srand (ACE_OS::time (0)); - ACE_TRY_NEW_ENV + try { for (size_t i = 0; i < MAX_ITERATIONS / 2; i++) { @@ -286,13 +280,12 @@ mutex_test_thread (void *args) i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in mutex_test_thread()"); + ex._tao_print_exception ( + "Unexpected exception caught in mutex_test_thread()"); *data->error_flag = 1; } - ACE_ENDTRY; return 0; } @@ -310,7 +303,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb) int shared_var = 0; int error_flag = 0; - ACE_TRY_NEW_ENV + try { RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (); @@ -332,13 +325,12 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb) CORBA::release (mutex); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_mutex_threads()"); + ex._tao_print_exception ( + "Unexpected exception caught in test_mutex_threads()"); return -1; } - ACE_ENDTRY; return error_flag; } @@ -352,11 +344,11 @@ mutex_test_try_lock_thread (void *args) RTCORBA::Mutex_ptr mutex = data->mutex; CORBA::Boolean result; - ACE_TRY_NEW_ENV + try { // 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); + result = mutex->try_lock (0u); if (result) { @@ -375,7 +367,7 @@ mutex_test_try_lock_thread (void *args) "attempting try_lock (5 sec) - expect failure after 5 secs (but no exceptions)\n")); timer.start (); - result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER); + result = mutex->try_lock (50000000u /*5sec*/); timer.stop (); if (result) @@ -403,13 +395,12 @@ mutex_test_try_lock_thread (void *args) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in mutex_test_try_lock_thread()"); + ex._tao_print_exception ( + "Unexpected exception caught in mutex_test_try_lock_thread()"); *data->error_flag = 1; } - ACE_ENDTRY; return 0; } @@ -423,13 +414,13 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) int shared_var = 0; int error_flag = 0; - ACE_TRY_NEW_ENV + try { 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); + result = mutex->try_lock (0u); if (!result) ACE_ERROR_RETURN ((LM_ERROR, "try_lock failed\n"), @@ -456,13 +447,12 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) CORBA::release (mutex); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in test_mutex_try_lock()"); + ex._tao_print_exception ( + "Unexpected exception caught in test_mutex_try_lock()"); return -1; } - ACE_ENDTRY; return error_flag; } @@ -472,10 +462,10 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -483,9 +473,8 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; @@ -528,13 +517,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Mutex test finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Mutex test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in Mutex test server:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 9ad9778c388..1e52bba6f1f 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -49,15 +49,13 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) } CORBA::Short -check_policy (Test_ptr server - ACE_ENV_ARG_DECL) +check_policy (Test_ptr server) { CORBA::Policy_var policy = - server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - ACE_ENV_ARG_PARAMETER); + server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE); RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; @@ -76,13 +74,13 @@ check_policy (Test_ptr server int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -90,16 +88,16 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Object_var object = - orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior1); - Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_var server1 = Test::_narrow (object.in ()); if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2. - object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2); - Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test_var server2 = Test::_narrow (object.in ()); if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -108,36 +106,35 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Short server1_priority = - check_policy (server1.in () ACE_ENV_ARG_PARAMETER); + check_policy (server1.in ()); if (server1_priority == -1) return -1; // Test object 2. CORBA::Short server2_priority = - check_policy (server2.in () ACE_ENV_ARG_PARAMETER); + check_policy (server2.in ()); if (server2_priority == -1) return -1; // Testing: make several invocations on test objects. for (int i = 0; i < 5; ++i) { - server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER); + server1->test_method (server1_priority); - server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER); + server2->test_method (server2_priority); } // Testing over. Shut down Server ORB. server1->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception in Server_Declared test client:"); + ex._tao_print_exception ( + "Unexpected exception in Server_Declared test client:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 8eb17270e82..c6322ced276 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -17,8 +17,7 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (CORBA::Short priority - ACE_ENV_ARG_DECL_NOT_USED) + void test_method (CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -35,21 +34,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (CORBA::Short priority - ACE_ENV_ARG_DECL) +Test_i::test_method (CORBA::Short priority) ACE_THROW_SPEC ((CORBA::SystemException)) { // Use RTCurrent to find out the CORBA priority of the current // thread. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in ()); if (CORBA::is_nil (obj.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); CORBA::Short servant_thread_priority = current->the_priority (); @@ -70,7 +68,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -158,27 +156,24 @@ create_object (RTPortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, CORBA::Short priority, - const char *filename - ACE_ENV_ARG_DECL) + const char *filename) { // Register with poa. PortableServer::ObjectId_var id; if (priority > -1) id = poa->activate_object_with_priority (server_impl, - priority - ACE_ENV_ARG_PARAMETER); + priority); else - id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); + id = poa->activate_object (server_impl); CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -221,21 +216,20 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { // RTORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); if (check_for_nil (rt_orb.in (), "RTORB") == -1) return -1; // RootPOA. object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (check_for_nil (root_poa.in (), "RootPOA") == -1) return -1; @@ -250,21 +244,18 @@ Task::svc (void) poa_policy_list.length (2); poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, - poa_priority - ACE_ENV_ARG_PARAMETER); + poa_priority); poa_policy_list[1] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID); PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (child_poa.in ()); if (check_for_nil (rt_poa.in (), "RTPOA") == -1) return -1; @@ -275,14 +266,14 @@ Task::svc (void) int result; 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); + -1, ior_output_file1); if (result == -1) return -1; // Create object 2 (override POA's priority). 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); + object_priority, ior_output_file2); if (result == -1) return -1; @@ -294,13 +285,12 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception caught in Server_Declared test server:"); + ex._tao_print_exception ( + "Unexpected exception caught in Server_Declared test server:"); return -1; } - ACE_ENDTRY; return 0; } @@ -308,11 +298,11 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse arguments. if (parse_args (argc, argv) != 0) @@ -360,12 +350,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 6ca122e99f7..e70b49ff04d 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -35,20 +35,20 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_var server = - Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -61,13 +61,11 @@ main (int argc, char *argv[]) // Make an invocation on the obtained Test object. server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 7731d22334c..1a154a92130 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -37,7 +37,7 @@ Test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Received request to shut down the ORB\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //************************************************************************* @@ -87,8 +87,7 @@ parse_args (int argc, char *argv[]) int check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) { // Users should never write code like below. // It is for testing purposes only! (Unfortunately, there @@ -100,12 +99,10 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, tao_poa.policies (); CORBA::Policy_var server_protocol = - policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); + policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL); RTCORBA::ServerProtocolPolicy_var policy = - RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ()); if (CORBA::is_nil (policy.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -132,8 +129,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, if (protocol_type == IOP::TAG_INTERNET_IOP) { RTCORBA::TCPProtocolProperties_var tcp_properties = - RTCORBA::TCPProtocolProperties::_narrow (properties.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::TCPProtocolProperties::_narrow (properties.in ()); if (!CORBA::is_nil (tcp_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -154,8 +150,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, else if (protocol_type == TAO_TAG_UIOP_PROFILE) { RTCORBA::UnixDomainProtocolProperties_var uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()); if (!CORBA::is_nil (uiop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -168,8 +163,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, else if (protocol_type == TAO_TAG_SHMEM_PROFILE) { RTCORBA::SharedMemoryProtocolProperties_var shmem_properties = - RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in ()); if (!CORBA::is_nil (shmem_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -194,8 +188,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, else if (protocol_type == TAO_TAG_DIOP_PROFILE) { RTCORBA::UserDatagramProtocolProperties_var diop_properties = - RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in ()); if (!CORBA::is_nil (diop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -206,8 +199,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, else if (protocol_type == TAO_TAG_SCIOP_PROFILE) { RTCORBA::StreamControlProtocolProperties_var sciop_properties = - RTCORBA::StreamControlProtocolProperties::_narrow (properties.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::StreamControlProtocolProperties::_narrow (properties.in ()); if (!CORBA::is_nil (sciop_properties.in ())) ACE_DEBUG ((LM_DEBUG, @@ -234,19 +226,19 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -256,14 +248,12 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RTORB"); + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); // Check ServerProtocol configurations. int result = check_server_protocol_at_root_poa (orb.in (), - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); if (result != 0) return -1; @@ -283,8 +273,7 @@ main (int argc, char *argv[]) CORBA::PolicyList poa_policy_list; poa_policy_list.length (1); poa_policy_list[0] = - rt_orb->create_server_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_server_protocol_policy (protocols); PortableServer::POA_var poa; @@ -293,8 +282,7 @@ main (int argc, char *argv[]) poa = root_poa->create_POA ("Child_POA", poa_manager.in (), - poa_policy_list - ACE_ENV_ARG_PARAMETER); + poa_policy_list); } else @@ -305,15 +293,14 @@ main (int argc, char *argv[]) Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); + poa->activate_object (&server_impl); CORBA::Object_var server = - poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + poa->id_to_reference (id.in ()); // Print Object IOR. CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ())); @@ -336,13 +323,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index bb03fa95230..a53a2b0a4da 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -74,13 +74,13 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); test_var test = - test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + test::_narrow (object.in ()); pid_t pid = ACE_OS::getpid (); @@ -89,8 +89,7 @@ Task::svc (void) { CORBA::Long r = test->method (pid, - i - ACE_ENV_ARG_PARAMETER); + i); ACE_ASSERT (r == i); // Assert disappears on with optimizations on. @@ -102,13 +101,11 @@ Task::svc (void) test->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -116,10 +113,10 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); int result = parse_args (argc, argv); @@ -163,12 +160,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 6b0cad7d3ab..dcf82a74e24 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -60,12 +60,10 @@ parse_args (int argc, char *argv[]) int write_ior_to_file (CORBA::ORB_ptr orb, - test_ptr test - ACE_ENV_ARG_DECL) + test_ptr test) { CORBA::String_var ior = - orb->object_to_string (test - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test); char filename[BUFSIZ]; ACE_OS::sprintf (filename, @@ -98,8 +96,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::POAManager_ptr poa_manager, PortableServer::POA_ptr root_poa, CORBA::ORB_ptr orb, - RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) + RTCORBA::RTORB_ptr rt_orb) { // Policies for the firstPOA to be created. CORBA::PolicyList policies (3); policies.length (3); @@ -107,8 +104,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Implicit_activation policy. policies[0] = root_poa->create_implicit_activation_policy - (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + (PortableServer::IMPLICIT_ACTIVATION); // Thread pool policy. policies[1] = @@ -117,15 +113,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, // Priority Model policy. policies[2] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Create the POA under the RootPOA. PortableServer::POA_var poa = root_poa->create_POA (poa_name, poa_manager, - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of POAs is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -148,8 +142,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, int result = write_ior_to_file (orb, - test.in () - ACE_ENV_ARG_PARAMETER); + test.in ()); return result; } @@ -177,34 +170,28 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::RTORB::_narrow (object.in ()); object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in ()); RTCORBA::Priority default_thread_priority = current->the_priority (); @@ -217,8 +204,7 @@ Task::svc (void) int result = write_ior_to_file (this->orb_.in (), - test.in () - ACE_ENV_ARG_PARAMETER); + test.in ()); if (result != 0) return result; @@ -237,12 +223,10 @@ Task::svc (void) default_thread_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_1 = - rt_orb->create_threadpool_policy (threadpool_id_1 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_1); CORBA::Boolean allow_borrowing = 0; RTCORBA::ThreadpoolLanes lanes (1); @@ -258,12 +242,10 @@ Task::svc (void) allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy_2 = - rt_orb->create_threadpool_policy (threadpool_id_2 - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id_2); result = create_POA_and_register_servant (threadpool_policy_1.in (), @@ -271,8 +253,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -282,8 +263,7 @@ Task::svc (void) poa_manager.in (), root_poa.in (), this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); + rt_orb.in ()); if (result != 0) return result; @@ -291,13 +271,11 @@ Task::svc (void) this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } @@ -305,13 +283,12 @@ Task::svc (void) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); int result = parse_args (argc, argv); @@ -360,12 +337,11 @@ main (int argc, char *argv[]) thread_manager.wait (); ACE_ASSERT (result != -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index 6bf036e1119..4a7e623ef80 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -19,8 +19,7 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Long test_i::method (CORBA::Long client_id, - CORBA::Long iteration - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long iteration) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. @@ -59,6 +58,5 @@ void test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index 5a3507aa59e..1bcbf6173cd 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -21,8 +21,7 @@ public: /// Test method. CORBA::Long method (CORBA::Long client_id, - CORBA::Long iteration - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long iteration) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index f5e1ca5729b..4c72811ab86 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -13,8 +13,7 @@ get_priority_bands (const char *test_type, const char *bands_file, RTCORBA::RTORB_ptr rt_orb, CORBA::PolicyList &policies, - int debug - ACE_ENV_ARG_DECL) + int debug) { // // Read bands from a file. @@ -97,8 +96,7 @@ get_priority_bands (const char *test_type, "\n\n")); CORBA::Policy_var banded_connection_policy = - rt_orb->create_priority_banded_connection_policy (bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (bands); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -205,8 +203,7 @@ get_priority_lanes (const char *test_type, CORBA::ULong max_request_buffer_size, CORBA::Boolean allow_borrowing, CORBA::PolicyList &policies, - int debug - ACE_ENV_ARG_DECL) + int debug) { ULong_Array priorities; int result = @@ -237,12 +234,10 @@ get_priority_lanes (const char *test_type, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); CORBA::Policy_var threadpool_policy = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -256,8 +251,7 @@ get_protocols (const char *test_type, const char *lanes_file, RTCORBA::RTORB_ptr rt_orb, CORBA::PolicyList &policies, - int debug - ACE_ENV_ARG_DECL) + int debug) { ULong_Array protocol_values; int result = @@ -286,8 +280,7 @@ get_protocols (const char *test_type, } CORBA::Policy_var protocol_policy = - rt_orb->create_client_protocol_policy (protocols - ACE_ENV_ARG_PARAMETER); + rt_orb->create_client_protocol_policy (protocols); policies.length (policies.length () + 1); policies[policies.length () - 1] = @@ -307,8 +300,7 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, CORBA::ULong max_request_buffer_size, CORBA::Boolean allow_borrowing, CORBA::PolicyList &policies, - int debug - ACE_ENV_ARG_DECL) + int debug) { RTCORBA::ThreadpoolLanes lanes; lanes.length (number_of_lanes); @@ -365,17 +357,14 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); policies.length (policies.length () + 1); policies[policies.length () - 1] = - rt_orb->create_priority_banded_connection_policy (bands - ACE_ENV_ARG_PARAMETER); + rt_orb->create_priority_banded_connection_policy (bands); policies.length (policies.length () + 1); policies[policies.length () - 1] = - rt_orb->create_threadpool_policy (threadpool_id - ACE_ENV_ARG_PARAMETER); + rt_orb->create_threadpool_policy (threadpool_id); } diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index 6cf0763f9bf..246a0842a3a 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -13,7 +13,7 @@ int Thread_Task::activate_task (int thr_count) { - ACE_TRY_NEW_ENV + try { ACE_NEW_RETURN (shutdown_lock_, TAO_SYNCH_MUTEX, @@ -25,65 +25,54 @@ Thread_Task::activate_task (int thr_count) active_thread_count_ = thr_count; - CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"); - this->current_ = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + this->current_ = RTScheduling::Current::_narrow (current_obj.in ()); const char * name = 0; CORBA::Policy_ptr sched_param = 0; CORBA::Policy_ptr implicit_sched_param = 0; - ACE_TRY_EX (ESS_out_of_cxt) + try { ACE_DEBUG ((LM_DEBUG, "Making an end_scheduling_segment call without first calling begin_scheduling_segment\n")); - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(ESS_out_of_cxt); + this->current_->end_scheduling_segment (name); } - ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex) + catch (const CORBA::BAD_INV_ORDER& ) { ACE_DEBUG ((LM_DEBUG, "End Scheduling Segment is out of context - Expected Exception\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "\n"); + ex._tao_print_exception ("\n"); } - ACE_ENDTRY; - ACE_TRY_EX(USS_out_of_cxt) + try { ACE_DEBUG ((LM_DEBUG, "Making an update_scheduling_segment call without first calling begin_scheduling_segment\n")); this->current_->update_scheduling_segment (name, sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX(USS_out_of_cxt); + implicit_sched_param); } - ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex) + catch (const CORBA::BAD_INV_ORDER& ) { ACE_DEBUG ((LM_DEBUG, "Update Scheduling Segment is out of context - Expected Exception\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Update Scheduling Segment is out of context:"); + ex._tao_print_exception ( + "Update Scheduling Segment is out of context:"); } - ACE_ENDTRY; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception:"); + ex._tao_print_exception ("Exception:"); } - ACE_ENDTRY; long flags = THR_NEW_LWP | THR_JOINABLE; if (this->activate (flags, @@ -100,7 +89,7 @@ Thread_Task::activate_task (int thr_count) int Thread_Task::svc (void) { - ACE_TRY_NEW_ENV + try { const char * name = 0; CORBA::Policy_ptr sched_param = 0; @@ -108,8 +97,7 @@ Thread_Task::svc (void) this->current_->begin_scheduling_segment ("Fellowship of the Rings", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); size_t count = 0; ACE_OS::memcpy (&count, @@ -123,14 +111,12 @@ Thread_Task::svc (void) //Start - Nested Scheduling Segment this->current_->begin_scheduling_segment ("Two Towers", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); //Start - Nested Scheduling Segment this->current_->begin_scheduling_segment ("The Return of the King", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); RTScheduling::Current::NameList_var segment_name_list = @@ -150,15 +136,12 @@ Thread_Task::svc (void) } } - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); //End - Nested Scheduling Segment - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); //End - Nested Scheduling Segment ACE_DEBUG ((LM_DEBUG, @@ -174,17 +157,15 @@ Thread_Task::svc (void) // exceptions on fast dual processor machines. ACE_OS::sleep (1); - orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + orb_->shutdown (0); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp index 829e485e925..c840d3937d0 100644 --- a/TAO/tests/RTScheduling/Current/test.cpp +++ b/TAO/tests/RTScheduling/Current/test.cpp @@ -7,19 +7,16 @@ int main (int argc, char* argv []) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"); - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () - ACE_ENV_ARG_PARAMETER); + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()); TAO_Scheduler scheduler (orb.in ()); @@ -36,13 +33,11 @@ main (int argc, char* argv []) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index 0ad5e1164da..d84ab87c1e1 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -20,8 +20,7 @@ public RTScheduling::ThreadAction public: Test_Thread_Action (void); - virtual void _cxx_do (CORBA::VoidData data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void _cxx_do (CORBA::VoidData data) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -33,8 +32,7 @@ Test_Thread_Action::Test_Thread_Action (void) } void -Test_Thread_Action::_cxx_do (CORBA::VoidData data - ACE_ENV_ARG_DECL) +Test_Thread_Action::_cxx_do (CORBA::VoidData data) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp index c38fb84ebab..32616d1aeb1 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp +++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp @@ -18,18 +18,15 @@ main (int argc, char* argv []) Test_Thread_Action thread_action; - ACE_TRY_NEW_ENV + try { orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"); - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () - ACE_ENV_ARG_PARAMETER); + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()); TAO_Scheduler* scheduler; ACE_NEW_RETURN (scheduler, @@ -39,13 +36,11 @@ main (int argc, char* argv []) manager->rtscheduler (scheduler); - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"); - current = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + current = RTScheduling::Current::_narrow (current_obj.in ()); - ACE_TRY_EX (block1) + try { ACE_DEBUG ((LM_DEBUG, @@ -58,29 +53,24 @@ main (int argc, char* argv []) sched_param, implicit_sched_param, 0, - 0 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (block1); + 0); } - ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex) + catch (const CORBA::BAD_INV_ORDER& ) { ACE_DEBUG ((LM_DEBUG, "Spawn should be in the context of a Scheduling Segment - Expected Exception\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "\n"); + ex._tao_print_exception ("\n"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Start - Scheduling Segment...\n")); current->begin_scheduling_segment ("Potter", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); size_t count = 0; ACE_OS::memcpy (&count, @@ -105,22 +95,18 @@ main (int argc, char* argv []) sched_param, implicit_sched_param, 0, - 0 - ACE_ENV_ARG_PARAMETER); + 0); - current->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + current->end_scheduling_segment (name); ACE_DEBUG ((LM_DEBUG, "End - Scheduling Segment %d\n", count)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught Exception\n"); + ex._tao_print_exception ("Caught Exception\n"); } - ACE_ENDTRY; ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index d2a55f7d2e4..944c91a088c 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -5,14 +5,12 @@ #include "ace/Atomic_Op.h" #include "tao/RTScheduling/Request_Interceptor.h" -TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) +TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb) { CORBA::Object_var current_obj = - orb->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTScheduler_Current"); - current_ = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + current_ = RTScheduling::Current::_narrow (current_obj.in ()); } TAO_Scheduler::~TAO_Scheduler (void) @@ -27,8 +25,7 @@ TAO_Scheduler::scheduling_policies (void) } void -TAO_Scheduler::scheduling_policies (const CORBA::PolicyList & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -49,8 +46,7 @@ TAO_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr TAO_Scheduler::create_resource_manager (const char *, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -59,8 +55,7 @@ TAO_Scheduler::create_resource_manager (const char *, void TAO_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -69,8 +64,7 @@ void TAO_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -80,8 +74,7 @@ void TAO_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -91,8 +84,7 @@ void TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -100,8 +92,7 @@ TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &, void TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &, - const char * - ACE_ENV_ARG_DECL_NOT_USED) + const char *) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -109,16 +100,14 @@ TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &, void TAO_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Policy_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info - ACE_ENV_ARG_DECL) +TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -137,17 +126,15 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque RTScheduling::Current::IdType_out guid_out, CORBA::String_out /*name*/, CORBA::Policy_out /*sched_param*/, - CORBA::Policy_out /*implicit_sched_param*/ - ACE_ENV_ARG_DECL) + CORBA::Policy_out /*implicit_sched_param*/) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { IOP::ServiceContext_var serv_cxt; - ACE_TRY + try { - serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo - ACE_ENV_ARG_PARAMETER); + serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo); size_t gu_id; ACE_OS::memcpy (&gu_id, @@ -169,71 +156,62 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque guid_out.ptr () = guid; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, "Invalid Service Context\n")); } - ACE_ENDTRY; } void -TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void -TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void -TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void -TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void -TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void -TAO_Scheduler::cancel (const RTScheduling::Current::IdType & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Scheduler::cancel (const RTScheduling::Current::IdType &) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h index 6444d869b56..27bb8751f52 100644 --- a/TAO/tests/RTScheduling/Scheduler.h +++ b/TAO/tests/RTScheduling/Scheduler.h @@ -11,15 +11,14 @@ public RTScheduling::Scheduler, { public: - TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS); + TAO_Scheduler (CORBA::ORB_ptr orb); ~TAO_Scheduler (void); 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) + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyList * poa_policies (void) @@ -29,53 +28,45 @@ public RTScheduling::Scheduler, ACE_THROW_SPEC ((CORBA::SystemException)); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr scheduling_parameter) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr scheduling_parameter) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * name) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr outer_sched_param) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -83,46 +74,37 @@ public RTScheduling::Scheduler, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_out implicit_sched_param) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void cancel (const RTScheduling::Current::IdType & guid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void cancel (const RTScheduling::Current::IdType & guid) ACE_THROW_SPEC ((CORBA::SystemException)); private: RTScheduling::Current_var current_; diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 6131ba2554e..83f368dbc91 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp @@ -42,22 +42,19 @@ main (int argc, char* argv []) test_var server; RTScheduling::Scheduler_var safe_scheduler; - ACE_TRY_NEW_ENV + try { orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) == -1) return (-1); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"); - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () - ACE_ENV_ARG_PARAMETER); + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()); TAO_Scheduler* scheduler; ACE_NEW_RETURN (scheduler, @@ -69,11 +66,9 @@ main (int argc, char* argv []) CORBA::Object_var object = - orb->string_to_object (ior.c_str () - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior.c_str ()); - server = test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + server = test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -83,11 +78,9 @@ main (int argc, char* argv []) 1); } - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"); - RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()); const char * name = 0; CORBA::Policy_ptr sched_param = 0; @@ -95,8 +88,7 @@ main (int argc, char* argv []) current->begin_scheduling_segment (name, sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); ACE_DEBUG ((LM_DEBUG, "Making a one-way request\n")); @@ -104,27 +96,23 @@ main (int argc, char* argv []) ACE_DEBUG ((LM_DEBUG, "Making a two-way request\n")); - server->two_way (ior.c_str () - ACE_ENV_ARG_PARAMETER); + server->two_way (ior.c_str ()); - current->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + current->end_scheduling_segment (name); } - ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex) + catch (const CORBA::THREAD_CANCELLED& ) { ACE_DEBUG ((LM_DEBUG, "Distributable Thread Cancelled - Expected Exception\n")); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 0; } - ACE_ENDTRY; orb->destroy (); diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index a95aec8680a..85301c079f7 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -19,8 +19,7 @@ public: { } - virtual void one_way (const char * message - ACE_ENV_ARG_DECL_NOT_USED) + virtual void one_way (const char * message) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -28,8 +27,7 @@ public: message)); } - virtual char * two_way (const char * message - ACE_ENV_ARG_DECL) + virtual char * two_way (const char * message) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -37,8 +35,7 @@ public: message)); RTScheduling::DistributableThread_var DT = - this->current_->lookup (*(this->current_->id ()) - ACE_ENV_ARG_PARAMETER); + this->current_->lookup (*(this->current_->id ())); DT->cancel (); @@ -82,34 +79,29 @@ parse_args (int argc, int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); parse_args (argc, argv); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); poa_manager->activate (); - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"); - RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()); test_impl* test_i; ACE_NEW_RETURN (test_i, @@ -119,18 +111,15 @@ main (int argc, char* argv[]) PortableServer::ObjectId_var id; - id = root_poa->activate_object (test_i - ACE_ENV_ARG_PARAMETER); + id = root_poa->activate_object (test_i); CORBA::Object_var server = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); CORBA::String_var ior; if (!CORBA::is_nil (server.in ())) { - ior = orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + ior = orb->object_to_string (server.in ()); } else { @@ -143,11 +132,9 @@ main (int argc, char* argv[]) "IOR = %s\n", ior.in ())); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"); - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () - ACE_ENV_ARG_PARAMETER); + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()); TAO_Scheduler scheduler (orb.in ()); manager->rtscheduler (&scheduler); @@ -167,13 +154,11 @@ main (int argc, char* argv[]) orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - 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 809bf443127..b33e02a1080 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -17,7 +17,7 @@ Thread_Task::guids (void) int Thread_Task::activate_task (CORBA::ORB_ptr orb) { - ACE_TRY_NEW_ENV + try { ACE_NEW_RETURN (shutdown_lock_, ACE_Lock_Adapter <TAO_SYNCH_MUTEX>, @@ -29,18 +29,14 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); - CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"); - this->current_ = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + this->current_ = RTScheduling::Current::_narrow (current_obj.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception:"); + ex._tao_print_exception ("Exception:"); } - ACE_ENDTRY; long flags = THR_NEW_LWP | THR_JOINABLE; if (this->ACE_Task <ACE_SYNCH>::activate (flags, @@ -63,7 +59,7 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) int Thread_Task::svc (void) { - ACE_TRY_NEW_ENV + try { const char * name = 0; CORBA::Policy_ptr sched_param = 0; @@ -72,8 +68,7 @@ Thread_Task::svc (void) //Start - Nested Scheduling Segment this->current_->begin_scheduling_segment ("Chamber of Secrets", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); size_t count = 0; ACE_OS::memcpy (&count, @@ -83,16 +78,14 @@ Thread_Task::svc (void) this->current_->begin_scheduling_segment ("Potter", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); this->guid_[guid_index++] = *(this->current_->id ()); //Start - Nested Scheduling Segment this->current_->begin_scheduling_segment ("Harry", sched_param, - implicit_sched_param - ACE_ENV_ARG_PARAMETER); + implicit_sched_param); { @@ -113,22 +106,19 @@ Thread_Task::svc (void) ACE_OS::sleep (50); - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); // End - Nested Scheduling Segment - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); // End - Nested Scheduling Segment - this->current_->end_scheduling_segment (name - ACE_ENV_ARG_PARAMETER); + this->current_->end_scheduling_segment (name); } - ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex) + catch (const CORBA::THREAD_CANCELLED& ) { ACE_DEBUG ((LM_DEBUG, "Distributable Thread Cancelled - Expected Exception\n")); @@ -141,11 +131,9 @@ Thread_Task::svc (void) return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp index 91e651ff7eb..3501ebf87f8 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp @@ -9,19 +9,16 @@ int main (int argc, char* argv []) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"); - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () - ACE_ENV_ARG_PARAMETER); + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()); TAO_Scheduler scheduler (orb.in ()); @@ -41,16 +38,13 @@ main (int argc, char* argv []) ACE_DEBUG ((LM_DEBUG, "Cancelling Threads.....\n")); - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"); - RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () - ACE_ENV_ARG_PARAMETER); + RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()); for (int i = 0; i < 4; i++) { - RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i] - ACE_ENV_ARG_PARAMETER); + RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]); DT->cancel (); } @@ -59,13 +53,11 @@ main (int argc, char* argv []) ACE_Thread_Manager::instance ()->wait (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h index ae4181971a9..c0331b431bf 100644 --- a/TAO/tests/RTScheduling/VoidData/test.h +++ b/TAO/tests/RTScheduling/VoidData/test.h @@ -5,7 +5,7 @@ class test_impl :public test { public: - virtual void bar (CORBA::VoidData something ACE_ENV_ARG_DECL_NOT_USED) + virtual void bar (CORBA::VoidData something) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp index 3d3f66b1056..c222feaef8c 100644 --- a/TAO/tests/RTScheduling/VoidData/test_client.cpp +++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp @@ -7,27 +7,24 @@ int main (int argc, char* argv []) { CORBA::ORB_var orb; - ACE_TRY_NEW_ENV + try { orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); test_impl foo_i; int something = 28; foo_i.bar ((CORBA::VoidData) &something); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); orb->shutdown (); orb->destroy (); return 0; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp index 6f8a4d665cc..a674abae643 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -15,7 +15,7 @@ void Oneway_Receiver::raise_no_permission (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } void @@ -25,9 +25,9 @@ Oneway_Receiver::destroy (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in ()); } Test::Shutdown_Helper_ptr diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index a206f5e0d4d..fe72789790a 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -14,5 +14,5 @@ void Shutdown_Helper::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index 719c4e87713..ac3f07029a5 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -70,32 +70,28 @@ parse_args (int argc, char *argv[]) return 0; } -void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL); -void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL); -void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL); -void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL); +void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver); +void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver); +void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver); +void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver); int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Oneway_Receiver_var oneway_receiver = - Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Oneway_Receiver::_narrow(tmp.in ()); if (CORBA::is_nil (oneway_receiver.in ())) { @@ -108,32 +104,28 @@ main (int argc, char *argv[]) if (test_sync_with_target) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n")); - run_test_sync_with_target (oneway_receiver.in () - ACE_ENV_ARG_PARAMETER); + run_test_sync_with_target (oneway_receiver.in ()); } 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); + run_test_sync_with_server (oneway_receiver.in ()); } 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); + run_test_sync_with_transport (oneway_receiver.in ()); } else { ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n")); - run_test_sync_none (oneway_receiver.in () - ACE_ENV_ARG_PARAMETER); + run_test_sync_none (oneway_receiver.in ()); } // 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); + orb->run (time); if (successful_calls == 0) ACE_ERROR ((LM_ERROR, "ERROR: No requests were successful\n")); @@ -149,29 +141,26 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } void -set_sync_scope_policy (Messaging::SyncScope sync_scope - ACE_ENV_ARG_DECL) +set_sync_scope_policy (Messaging::SyncScope sync_scope) { int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, ""); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -184,11 +173,9 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope CORBA::PolicyList policies(1); policies.length (1); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); } @@ -196,10 +183,9 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope void run_one_iteration (int i, Test::Oneway_Receiver_ptr oneway_receiver, - Test::Shutdown_Helper_ptr shutdown_helper - ACE_ENV_ARG_DECL) + Test::Shutdown_Helper_ptr shutdown_helper) { - ACE_TRY + try { if (i == iterations / 3) { @@ -214,10 +200,9 @@ run_one_iteration (int i, shutdown_helper->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; oneway_receiver->raise_no_permission (); } @@ -228,14 +213,13 @@ call_failed (const CORBA::SystemException &ex) { failed_calls++; - ACE_PRINT_EXCEPTION (ex, "Exception raised"); + ex._tao_print_exception ("Exception raised"); } void -run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver) { - set_sync_scope_policy (Messaging::SYNC_WITH_TARGET ACE_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_TARGET); Test::Shutdown_Helper_var shutdown_helper = oneway_receiver->get_shutdown_helper (); @@ -243,26 +227,25 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver int had_comm_failure = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { - run_one_iteration (i, oneway_receiver, shutdown_helper.in () - ACE_ENV_ARG_PARAMETER); + run_one_iteration (i, oneway_receiver, shutdown_helper.in ()); } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { if (server_status == ALIVE) successful_calls++; else call_failed (ex); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const CORBA::OBJECT_NOT_EXIST& ex) { if (server_status == DESTROYED) successful_calls++; else call_failed (ex); } - ACE_CATCH (CORBA::COMM_FAILURE, ex) + catch (const CORBA::COMM_FAILURE& ex) { if (server_status == SHUTDOWN && had_comm_failure == 0) successful_calls++; @@ -270,26 +253,24 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver call_failed (ex); had_comm_failure = 1; } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { if (server_status == SHUTDOWN) successful_calls++; else call_failed (ex); } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { call_failed (ex); } - ACE_ENDTRY; } } void -run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver) { - set_sync_scope_policy (Messaging::SYNC_WITH_SERVER ACE_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_SERVER); Test::Shutdown_Helper_var shutdown_helper = oneway_receiver->get_shutdown_helper (); @@ -297,10 +278,9 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver int had_comm_failure = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { - run_one_iteration (i, oneway_receiver, shutdown_helper.in () - ACE_ENV_ARG_PARAMETER); + run_one_iteration (i, oneway_receiver, shutdown_helper.in ()); if (server_status == DESTROYED || server_status == SHUTDOWN) @@ -308,18 +288,18 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver else successful_calls++; } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { call_failed (ex); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const CORBA::OBJECT_NOT_EXIST& ex) { if (server_status == DESTROYED) successful_calls++; else call_failed (ex); } - ACE_CATCH (CORBA::COMM_FAILURE, ex) + catch (const CORBA::COMM_FAILURE& ex) { if (server_status == SHUTDOWN && had_comm_failure == 0) successful_calls++; @@ -327,48 +307,43 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver call_failed (ex); had_comm_failure = 1; } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { if (server_status == SHUTDOWN) successful_calls++; else call_failed (ex); } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { call_failed (ex); } - ACE_ENDTRY; } } /// Helper routine to run the sync_with_transport and sync_none tests. void -run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL); +run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver); void -run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver) { - set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT ACE_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT); - run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); + run_test_unreliable (oneway_receiver); } void -run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver) { - set_sync_scope_policy (Messaging::SYNC_NONE ACE_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_NONE); - run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); + run_test_unreliable (oneway_receiver); } void -run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver - ACE_ENV_ARG_DECL) +run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver) { Test::Shutdown_Helper_var shutdown_helper = oneway_receiver->get_shutdown_helper (); @@ -377,10 +352,9 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver int had_transient = 0; for (int i = 0; i != iterations; ++i) { - ACE_TRY + try { - run_one_iteration (i, oneway_receiver, shutdown_helper.in () - ACE_ENV_ARG_PARAMETER); + run_one_iteration (i, oneway_receiver, shutdown_helper.in ()); // A few failures can go undetected... if (server_status == SHUTDOWN) @@ -392,19 +366,19 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver else successful_calls++; } - ACE_CATCH (CORBA::NO_PERMISSION, ex) + catch (const CORBA::NO_PERMISSION& ex) { call_failed (ex); } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const CORBA::OBJECT_NOT_EXIST& ex) { call_failed (ex); } - ACE_CATCH (CORBA::COMM_FAILURE, ex) + catch (const CORBA::COMM_FAILURE& ex) { call_failed (ex); } - ACE_CATCH (CORBA::TRANSIENT, ex) + catch (const CORBA::TRANSIENT& ex) { if (server_status == SHUTDOWN) successful_calls++; @@ -412,11 +386,10 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver call_failed (ex); had_transient = 1; } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { call_failed (ex); } - ACE_ENDTRY; } ACE_DEBUG ((LM_DEBUG, "Undetected TRANSIENT count = %d\n", undetected)); diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 0aad3f78121..b435475d19b 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -37,16 +37,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -69,7 +69,7 @@ main (int argc, char *argv[]) oneway_receiver_impl->_this (); CORBA::String_var ior = - orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_receiver.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,17 +87,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 48f6c622aa9..6285c8e221f 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -37,33 +37,27 @@ private: int MT_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { for (CORBA::Long i = 0; i != 2000; ++i) { CORBA::Object_var one_ref = - this->p_->servant_to_reference (this->one_ - ACE_ENV_ARG_PARAMETER); + this->p_->servant_to_reference (this->one_); CORBA::Object_var two_ref = - this->p_->servant_to_reference (this->two_ - ACE_ENV_ARG_PARAMETER); + this->p_->servant_to_reference (this->two_); CORBA::Object_var three_ref = - this->p_->servant_to_reference (this->three_ - ACE_ENV_ARG_PARAMETER); + this->p_->servant_to_reference (this->three_); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Caugh exception \n"); + ex._tao_print_exception ("(%P|%t) Caugh exception \n"); } - ACE_ENDTRY; return 0; } @@ -97,16 +91,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -143,21 +137,17 @@ main (int argc, char *argv[]) PortableServer::POA_var first_poa = root_poa->create_POA ("first POA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); PortableServer::ObjectId_var oid1 = - first_poa->activate_object (one_impl - ACE_ENV_ARG_PARAMETER); + first_poa->activate_object (one_impl); PortableServer::ObjectId_var oid2 = - first_poa->activate_object (two_impl - ACE_ENV_ARG_PARAMETER); + first_poa->activate_object (two_impl); PortableServer::ObjectId_var oid3 = - first_poa->activate_object (three_impl - ACE_ENV_ARG_PARAMETER); + first_poa->activate_object (three_impl); MT_Task task (first_poa.in (), @@ -177,17 +167,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp index da045e2503f..ac237e4501d 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.cpp +++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp @@ -4,8 +4,7 @@ #include "Test_i.h" void -test_i::send_stuff (const char* string - ACE_ENV_ARG_DECL_NOT_USED) +test_i::send_stuff (const char* string) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h index 0f6e923322d..7bb9a6d777e 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.h +++ b/TAO/tests/Server_Connection_Purging/Test_i.h @@ -13,8 +13,7 @@ class test_i { public: // = The skeleton methods - virtual void send_stuff (const char* string - ACE_ENV_ARG_DECL) + virtual void send_stuff (const char* string) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index b48db4e4d30..009e401c408 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -30,18 +30,17 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -64,7 +63,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -80,21 +79,19 @@ main (int argc, char *argv[]) ACE_Time_Value tv (120, 0); - orb->run (&tv ACE_ENV_ARG_PARAMETER); + orb->run (&tv); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index 32b443fe813..b2392e6dea6 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -20,5 +20,5 @@ void Ping_Service::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index 2c42c726a34..2c75dd5197f 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -42,19 +42,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Ping_Service_var ping_service = - Test::Ping_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Ping_Service::_narrow(tmp.in ()); if (CORBA::is_nil (ping_service.in ())) { @@ -76,13 +76,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 7cbf40f1aeb..1e4701d7cdb 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -36,16 +36,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,7 +68,7 @@ main (int argc, char *argv[]) ping_service_impl->_this (); CORBA::String_var ior = - orb->object_to_string (ping_service.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (ping_service.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -86,17 +86,15 @@ 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); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp index 488ed116010..379c52e6aa5 100644 --- a/TAO/tests/Server_Port_Zero/Hello.cpp +++ b/TAO/tests/Server_Port_Zero/Hello.cpp @@ -23,5 +23,5 @@ void Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 2988d821eae..8745f87ed5f 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -39,16 +39,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,7 +71,7 @@ main (int argc, char *argv[]) hello_impl->_this (); CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -87,21 +87,19 @@ main (int argc, char *argv[]) ACE_Time_Value tv (3, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index 8beb519c4a0..1b6ef1afe6d 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -71,16 +71,14 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -89,12 +87,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); + orb->string_to_object (IOR); // Try to narrow the object reference to a <test> reference. - test_var test_object = test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test_var test_object = test::_narrow (object.in ()); test::data the_data0 (data_bytes); the_data0.length (data_bytes); @@ -115,18 +111,15 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i, - the_data0 - ACE_ENV_ARG_PARAMETER); + the_data0); // Invoke the oneway method. test_object->method (i, - the_data1 - ACE_ENV_ARG_PARAMETER); + the_data1); // Invoke the oneway method. test_object->method (i, - the_data2 - ACE_ENV_ARG_PARAMETER); + the_data2); } // Shutdown server. @@ -145,13 +138,11 @@ main (int argc, char **argv) // queues before main() ends. orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 19cd706fd45..fe5f4460bcb 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -37,21 +37,18 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -65,8 +62,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,16 +82,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index a35c4c057e4..edf2618af87 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, - const test::data & - ACE_ENV_ARG_DECL_NOT_USED) + const test::data &) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -33,6 +32,5 @@ test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown... ")); - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index 6326e295cdd..e55503154a7 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -29,8 +29,7 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, - const test::data & - ACE_ENV_ARG_DECL_NOT_USED) + const test::data &) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 766e16bd8bd..4caca817ffd 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -8,8 +8,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) } Test_ptr -Smart_Test_Factory::create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED) +Smart_Test_Factory::create_proxy (Test_ptr proxy) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index a9702e0cc56..df80c6814f4 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -7,8 +7,7 @@ public: Smart_Test_Factory (void); - virtual Test_ptr create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Test_ptr create_proxy (Test_ptr proxy); // This method will create the smart_proxy. }; diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 6a61bacafdb..5d72b276cb3 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -117,20 +117,18 @@ main (int argc, char *argv[]) "client (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); if (register_smart_proxy == 1) { // To use the smart proxy it is necessary to allocate the @@ -150,8 +148,7 @@ main (int argc, char *argv[]) } Test_var server = - Test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -196,8 +193,7 @@ main (int argc, char *argv[]) /* Test_var server1 = - Test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -241,13 +237,11 @@ main (int argc, char *argv[]) server1->shutdown (); */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index e16d114222e..183d5451e8f 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -32,8 +32,7 @@ public: CORBA::Short box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long tickets (CORBA::Short number - ACE_ENV_ARG_DECL) + CORBA::Long tickets (CORBA::Short number) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -57,8 +56,7 @@ Test_i::box_prices (void) } CORBA::Long -Test_i::tickets (CORBA::Short number - ACE_ENV_ARG_DECL_NOT_USED) +Test_i::tickets (CORBA::Short number) ACE_THROW_SPEC ((CORBA::SystemException)) { return 125 * number; @@ -68,7 +66,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } static const char *ior_output_file = 0; @@ -101,27 +99,23 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (parse_args (argc, argv) != 0) return 1; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. @@ -132,8 +126,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (Test_object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (Test_object.in ()); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -161,15 +154,12 @@ main (int argc, char *argv[]) "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in setting up server"); + ex._tao_print_exception ("Exception in setting up server"); ACE_ASSERT (0); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp index 2442eee0e51..27abe97ce77 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp @@ -22,10 +22,10 @@ Collocation_Test::Collocation_Test (void) } int -Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) +Collocation_Test::init (int argc, char *argv[]) { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0); int result = this->parse_args (argc, argv); if (result != 0) @@ -33,11 +33,11 @@ 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); + this->orb_->resolve_initial_references ("RootPOA"); // Narrow the Object reference to a POA reference this->root_poa_ = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Get the POAManager of RootPOA this->poa_manager_ = @@ -45,31 +45,25 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) // 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); + this->root_poa_->activate_object (&this->top_servant_); // // We only care about the most derived class here. // this->diamond_obj_ = this->diamond_servant_._this (); id = - this->root_poa_->activate_object (&this->diamond_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->diamond_servant_); // We only care about the most derived class here. - this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()); id = - this->root_poa_->activate_object (&this->left_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->left_servant_); id = - this->root_poa_->activate_object (&this->right_servant_ - ACE_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (&this->right_servant_); CORBA::String_var str = - this->orb_->object_to_string (this->diamond_obj_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (this->diamond_obj_.in ()); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", str.in())); @@ -99,16 +93,16 @@ Collocation_Test::test_narrow (void) -1); Diamond::Top_var top = - Diamond::Top::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); + Diamond::Top::_narrow (this->diamond_obj_.in()); Diamond::Left_var left = - Diamond::Left::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); + Diamond::Left::_narrow (this->diamond_obj_.in()); Diamond::Right_var right = - Diamond::Right::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); + Diamond::Right::_narrow (this->diamond_obj_.in()); Diamond::Buttom_var buttom = - Diamond::Buttom::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER); + Diamond::Buttom::_narrow (this->diamond_obj_.in()); CORBA::String_var str = top->shape (); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h index af950ec9cec..7d502a7c8b6 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h @@ -28,7 +28,7 @@ class Collocation_Test public: Collocation_Test (void); - int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED); + int init (int argc, char *argv[]); // Initializing the Collocation_Test object. int parse_args (int argc, char *argv[]); diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index d8d6d3aa4bc..e7124f4340f 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -12,7 +12,6 @@ Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void) Diamond::Top_ptr Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED ) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -30,7 +29,7 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy) } char * -Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL) +Smart_Diamond_Top_Proxy::shape () ACE_THROW_SPEC (( CORBA::SystemException )) @@ -38,23 +37,21 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is ")); char *ans= 0; - ACE_TRY + try { ans = ACE_OS::strdup ( Diamond::TAO_Diamond_Top_Smart_Proxy_Base::shape ( - ACE_ENV_SINGLE_ARG_PARAMETER ) ); ACE_DEBUG ((LM_DEBUG, "%s\n", ans)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught Exception"); + ex._tao_print_exception ("Uncaught Exception"); return 0; } - ACE_ENDTRY; return ans; } diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h index 35930cf52cf..1ad82aba624 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h @@ -12,8 +12,7 @@ class MY_Stub_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Dia Smart_Diamond_Top_Factory (void); - virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy); // This method will create the smart_proxy. }; @@ -25,8 +24,7 @@ class MY_Stub_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy); - virtual char * shape ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * shape () ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp index 0494c5f5b7a..2b5dc93744b 100644 --- a/TAO/tests/Smart_Proxies/Collocation/main.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp @@ -9,17 +9,16 @@ int main (int argc, char *argv[]) { Collocation_Test coll_test; - ACE_TRY_NEW_ENV + try { - coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); + coll_test.init (argc, argv); coll_test.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught exception: "); + ex._tao_print_exception ("Uncaught exception: "); } - ACE_ENDTRY; return 0; } 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 569ec789b91..0e5e1502cbb 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp @@ -7,8 +7,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Smart_Test_Proxy::method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -16,18 +15,15 @@ Smart_Test_Proxy::method (CORBA::Short boo "Yahoo, I am smart\n")); CORBA::Short retval = 0; - ACE_TRY + try { - retval = TAO_Test_Smart_Proxy_Base::method (boo - ACE_ENV_ARG_PARAMETER); + retval = TAO_Test_Smart_Proxy_Base::method (boo); } - ACE_CATCH (Test::Oops, reason) + catch (const Test::Oops& reason) { - ACE_PRINT_EXCEPTION (reason, - "User Exception"); + reason._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h index a31d8556f36..e8207d93640 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h @@ -7,8 +7,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp index 1d8380fc600..a6d5caa0f2e 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp @@ -9,8 +9,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) } Test_ptr -Smart_Test_Factory::create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED) +Smart_Test_Factory::create_proxy (Test_ptr proxy) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h index fcfcc2a7517..21f7cef8bef 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h @@ -14,8 +14,7 @@ public: Smart_Test_Factory (void); // This method will create the smart_proxy. - virtual Test_ptr create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Test_ptr create_proxy (Test_ptr proxy); }; // The following Factory is used by the ACE_Service_Config to diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 1f69262842d..572b80866fd 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -53,27 +53,24 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); // To use the smart proxy just enter it as a svc.conf // entry. Test_var server = - Test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -86,13 +83,11 @@ main (int argc, char *argv[]) server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 583cc64c268..a517bd7deeb 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -29,8 +29,7 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL) + CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); @@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i :: method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Test_i :: method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -99,27 +97,23 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (parse_args (argc, argv) != 0) return 1; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. @@ -130,8 +124,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (Test_object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (Test_object.in ()); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -158,15 +151,12 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in setting up server"); + ex._tao_print_exception ("Exception in setting up server"); ACE_ASSERT (0); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp index 2b9bc6ff99d..fe230c1a052 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp @@ -10,8 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory) } Test_ptr -Smart_Test_Factory::create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED) +Smart_Test_Factory::create_proxy (Test_ptr proxy) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -29,8 +28,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Smart_Test_Proxy::method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -38,18 +36,15 @@ Smart_Test_Proxy::method (CORBA::Short boo "Yahoo, I am smart\n")); CORBA::Short retval = 0; - ACE_TRY + try { - retval = TAO_Test_Smart_Proxy_Base::method (boo - ACE_ENV_ARG_PARAMETER); + retval = TAO_Test_Smart_Proxy_Base::method (boo); } - ACE_CATCH (Test::Oops, reason) + catch (const Test::Oops& reason) { - ACE_PRINT_EXCEPTION (reason, - "User Exception"); + reason._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h index f024b4b69f7..73515c2109e 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h @@ -8,8 +8,7 @@ public: Smart_Test_Factory (int one_shot_factory = 1); - virtual Test_ptr create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Test_ptr create_proxy (Test_ptr proxy); // This method will create the smart_proxy. }; @@ -18,8 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index 2dd2519cdaa..e2b02924fcc 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -63,24 +63,21 @@ run_test (CORBA::ORB_ptr orb_ptr, { CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr); CORBA::Object_var object; - ACE_TRY_NEW_ENV + try { if (target == 1) { object = - orb->string_to_object (ior1 - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior1); } else { object = - orb->string_to_object (ior2 - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior2); } Test_var server = - Test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -91,25 +88,22 @@ run_test (CORBA::ORB_ptr orb_ptr, server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); } - ACE_ENDTRY; return 0; } int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; @@ -135,13 +129,11 @@ main (int argc, char *argv[]) run_test (orb.in (), 2); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 027b6855313..66f7a13e3d0 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -29,8 +29,7 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL) + CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); @@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i :: method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Test_i :: method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -66,7 +64,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } static const char *ior_output_file = 0; @@ -99,27 +97,23 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (parse_args (argc, argv) != 0) return 1; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. @@ -130,8 +124,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (Test_object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (Test_object.in ()); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -159,15 +152,12 @@ main (int argc, char *argv[]) "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in setting up server"); + ex._tao_print_exception ("Exception in setting up server"); ACE_ASSERT (0); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index ebb632a5b9e..bb3bf989309 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -11,8 +11,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) } Test_ptr -Smart_Test_Factory::create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED) +Smart_Test_Factory::create_proxy (Test_ptr proxy) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -46,8 +45,7 @@ Smart_Test_Proxy::convert_to_ior (bool, } CORBA::Short -Smart_Test_Proxy::method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Smart_Test_Proxy::method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -55,18 +53,15 @@ Smart_Test_Proxy::method (CORBA::Short boo "Yahoo, I am smart\n")); CORBA::Short retval = 0; - ACE_TRY + try { - retval = TAO_Test_Smart_Proxy_Base::method (boo - ACE_ENV_ARG_PARAMETER); + retval = TAO_Test_Smart_Proxy_Base::method (boo); } - ACE_CATCH (Test::Oops, reason) + catch (const Test::Oops& reason) { - ACE_PRINT_EXCEPTION (reason, - "User Exception"); + reason._tao_print_exception ("User Exception"); return -1; } - ACE_ENDTRY; return retval; } diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index 76d38be6245..f31fe5eecff 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -9,8 +9,7 @@ public: Smart_Test_Factory (void); - virtual Test_ptr create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Test_ptr create_proxy (Test_ptr proxy); // This method will create the smart_proxy. }; @@ -21,11 +20,10 @@ public: virtual bool can_convert_to_ior (void) const; - virtual char* convert_to_ior (bool use_omg_ior_format, + virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; - virtual CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index d4e304f9c11..d92fa486932 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -55,20 +55,18 @@ int main (int argc, char *argv[]) { int status = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); // To use the smart proxy it is necessary to allocate the // user-defined smart factory on the heap as the smart proxy @@ -85,8 +83,7 @@ main (int argc, char *argv[]) ACE_UNUSED_ARG (test_factory); Test_var server = - Test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -110,11 +107,10 @@ main (int argc, char *argv[]) catch (const CORBA::MARSHAL& ex) { status = 1; - ACE_PRINT_EXCEPTION (ex, - "Unexpected MARSHAL exception:"); + ex._tao_print_exception ("Unexpected MARSHAL exception:"); } - server->method (0 ACE_ENV_ARG_PARAMETER); + server->method (0); server->shutdown (); @@ -126,13 +122,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); status = 1; } - ACE_ENDTRY; return status; } diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp index 33354c75f64..39dcc2ce692 100644 --- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp @@ -3,8 +3,7 @@ #include "Smart_Proxy_Impl.h" Test_ptr -Test_Smart_Factory::create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_NOT_USED) +Test_Smart_Factory::create_proxy (Test_ptr proxy) { // creat Smart_Proxy ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h index 481a410487a..8161ff23d2d 100644 --- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h @@ -14,6 +14,5 @@ public: class Test_Smart_Factory: public TAO_Test_Default_Proxy_Factory { public: - virtual Test_ptr create_proxy (Test_ptr proxy - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Test_ptr create_proxy (Test_ptr proxy); }; diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp index 29d339a3a31..18c29ca92c1 100644 --- a/TAO/tests/Smart_Proxies/dtor/client.cpp +++ b/TAO/tests/Smart_Proxies/dtor/client.cpp @@ -35,18 +35,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; - CORBA::Object_var obj = orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object (ior); // force a scope to see the destruction of the server object { @@ -58,8 +56,7 @@ int main (int argc, char* argv[]) ACE_UNUSED_ARG (test_factory); Test_var server = - Test::_narrow(obj.in() - ACE_ENV_ARG_PARAMETER); + Test::_narrow(obj.in()); if (CORBA::is_nil (server.in())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -99,13 +96,11 @@ int main (int argc, char* argv[]) orb->destroy(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client-side exception:"); + ex._tao_print_exception ("Client-side exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index e835df199e1..85bb22271ad 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -9,8 +9,7 @@ class Test_i: public virtual POA_Test public: Test_i (CORBA::ORB_ptr orb); - void hello (CORBA::Long howmany - ACE_ENV_ARG_DECL) + void hello (CORBA::Long howmany) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) @@ -26,8 +25,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::hello (CORBA::Long howmany - ACE_ENV_ARG_DECL_NOT_USED) +Test_i::hello (CORBA::Long howmany) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "hello called with : %i \n", howmany)); @@ -37,7 +35,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } static const char *ior_output_file = 0; @@ -69,24 +67,20 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; // Obtain RootPOA. - CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in() - ACE_ENV_ARG_PARAMETER); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in()); // Get the POAManager of the RootPOA PortableServer::POAManager_var poa_mgr = @@ -98,15 +92,12 @@ int main (int argc, char* argv[]) Test_i servant (orb.in ()); PortableServer::ObjectId_var oid = - root_poa->activate_object (&servant - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&servant); - obj = root_poa->id_to_reference (oid.in() - ACE_ENV_ARG_PARAMETER); + obj = root_poa->id_to_reference (oid.in()); CORBA::String_var ior = - orb->object_to_string (obj.in() - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in()); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -131,18 +122,15 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in setting up server"); + ex._tao_print_exception ("Exception in setting up server"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index b4a86a45b7e..f1a83fa6b95 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -29,8 +29,7 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo - ACE_ENV_ARG_DECL) + CORBA::Short method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); @@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i :: method (CORBA::Short boo - ACE_ENV_ARG_DECL) +Test_i :: method (CORBA::Short boo) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -66,7 +64,7 @@ void Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } static const char *ior_output_file = 0; @@ -99,14 +97,12 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) return 1; @@ -114,12 +110,10 @@ main (int argc, char *argv[]) Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); // Get the POAManager of the RootPOA. @@ -130,8 +124,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (Test_object.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (Test_object.in ()); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -158,17 +151,14 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in setting up server"); + ex._tao_print_exception ("Exception in setting up server"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp index a1ab6b34212..5fb430bd1b8 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.cpp +++ b/TAO/tests/Stack_Recursion/Client_Task.cpp @@ -24,8 +24,7 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->validate_connections (); @@ -40,15 +39,13 @@ Client_Task::svc (void) Test::Payload_var pl = new Test::Payload; Test::Payload_out payload (pl.out ()); this->sender_->get_data (this->event_size_, - payload - ACE_ENV_ARG_PARAMETER); + payload); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); return 0; } @@ -59,11 +56,11 @@ Client_Task::validate_connections (void) { for (int i = 0 ; i != 100; i++) { - ACE_TRY + try { this->sender_->ping (); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } } diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp index 49325025f7c..1cbbf0bc8ea 100644 --- a/TAO/tests/Stack_Recursion/Sender.cpp +++ b/TAO/tests/Stack_Recursion/Sender.cpp @@ -34,8 +34,7 @@ Sender::is_done (void) const CORBA::Boolean Sender::get_data (CORBA::ULong size, - Test::Payload_out payload - ACE_ENV_ARG_DECL_NOT_USED) + Test::Payload_out payload) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index 07ed0952024..3acc8583883 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -27,8 +27,7 @@ public: // = The skeleton methods virtual CORBA::Boolean get_data (CORBA::ULong size, - Test::Payload_out payload - ACE_ENV_ARG_DECL) + Test::Payload_out payload) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Long get_event_count (void) diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp index 83b28ef8c43..0e0f4521369 100644 --- a/TAO/tests/Stack_Recursion/Server_Task.cpp +++ b/TAO/tests/Stack_Recursion/Server_Task.cpp @@ -22,22 +22,20 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { while (!this->sender_->is_done ()) { // run the test for at most 120 seconds... ACE_Time_Value tv (240, 0); - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n")); return 0; } diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index 235fe7ce2d6..b072572d38c 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -37,19 +37,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Test::Sender_var sender = - Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::Sender::_narrow(tmp.in ()); if (CORBA::is_nil (sender.in ())) { @@ -84,13 +84,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index 134ec55166b..dacec2af3a7 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -38,13 +38,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,7 +52,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -70,8 +70,7 @@ main (int argc, char *argv[]) sender_impl->_this (); CORBA::String_var ior = - orb->object_to_string (sender.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (sender.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -98,18 +97,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index a6e68947d1c..d10616be198 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -64,19 +64,19 @@ Client::Client () int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -104,13 +104,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index fdeefc29ba0..5f462b25f03 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -64,7 +64,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -87,17 +87,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index a907386b8a8..d09ed7dc969 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -119,7 +119,7 @@ parse_args (int argc, char **argv) } test_ptr -setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) +setup_policies (CORBA::ORB_ptr orb, test_ptr object) { test_var object_with_policy; @@ -137,16 +137,13 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) rt_timeout_any <<= rt_timeout; policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - rt_timeout_any - ACE_ENV_ARG_PARAMETER); + rt_timeout_any); CORBA::Object_var object_temp = object->_set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); - object_with_policy = test::_narrow (object_temp.in () - ACE_ENV_ARG_PARAMETER); + object_with_policy = test::_narrow (object_temp.in ()); policy_list[0]->destroy (); } @@ -160,16 +157,13 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_any - ACE_ENV_ARG_PARAMETER); + sync_any); CORBA::Object_var object_temp = object_with_policy->_set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); - test_var object_with_two_policies = test::_narrow (object_temp.in () - ACE_ENV_ARG_PARAMETER); + test_var object_with_two_policies = test::_narrow (object_temp.in ()); policy_list[0]->destroy (); @@ -179,16 +173,14 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Initialize options based on command-line arguments. int parse_args_result = parse_args (argc, argv); @@ -197,17 +189,14 @@ 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); + orb->string_to_object (IOR); // Try to narrow the object reference to a <test> reference. - test_var test_object_no_policy = test::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + test_var test_object_no_policy = test::_narrow (object.in ()); // Setup buffering and timeout test_var test_object = setup_policies (orb.in (), - test_object_no_policy.in () - ACE_ENV_ARG_PARAMETER); + test_object_no_policy.in ()); test::data the_data (data_bytes); the_data.length (data_bytes); @@ -219,8 +208,7 @@ main (int argc, char **argv) test_object->method (i, start.msec (), the_data, - work - ACE_ENV_ARG_PARAMETER); + work); ACE_Time_Value end = ACE_OS::gettimeofday (); @@ -233,7 +221,7 @@ 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); + orb->run (sleep_interval); } ACE_DEBUG ((LM_DEBUG, "client: flushing\n")); @@ -244,10 +232,10 @@ 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); + test_object_no_policy->shutdown (now); } - orb->shutdown (1 ACE_ENV_ARG_PARAMETER); + orb->shutdown (1); // Destroy the ORB. On some platforms, e.g., Win32, the socket // library is closed at the end of main(). This means that any @@ -257,13 +245,11 @@ main (int argc, char **argv) // queues before main() ends. orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client side exception caught:"); + ex._tao_print_exception ("Client side exception caught:"); return -1; } - ACE_ENDTRY; return 0; diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 13bdec2868b..040327785a9 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -37,21 +37,18 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -65,8 +62,7 @@ main (int argc, char *argv[]) servant._this (); CORBA::String_var ior = - orb->object_to_string (server.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,16 +82,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server side exception caught:"); + ex._tao_print_exception ("Server side exception caught:"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index 8734af8fd5e..cc2786bbc7f 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -16,8 +16,7 @@ void test_i::method (CORBA::ULong request_number, CORBA::Long start_time, const test::data &, - CORBA::ULong work - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong work) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value start (0); @@ -42,12 +41,12 @@ test_i::flush (void) } void -test_i::shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL) +test_i::shutdown (CORBA::Long start_time) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value start (0); start.msec (start_time); ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n", (ACE_OS::gettimeofday() - start).msec ())); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h index 3698e023a54..a08938cf539 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.h +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h @@ -32,14 +32,13 @@ public: void method (CORBA::ULong request_number, CORBA::Long start_time, const test::data &, - CORBA::ULong work - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::ULong work) ACE_THROW_SPEC ((CORBA::SystemException)); void flush (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL) + void shutdown (CORBA::Long start_time) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index a069f22777f..841ac2318f2 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -57,16 +57,15 @@ static int in_time_count[4] = {0, 0, 0, 0}; void send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb, Simple_Server_ptr server, - CORBA::Long t - ACE_ENV_ARG_DECL) + CORBA::Long t) { - ACE_TRY + try { - server->echo (0, t ACE_ENV_ARG_PARAMETER); + server->echo (0, t); in_time_count[ctype]++; } - ACE_CATCH (CORBA::TIMEOUT, timeout) + catch (const CORBA::TIMEOUT& ) { timeout_count[ctype]++; @@ -81,27 +80,26 @@ send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb, // This is a non-standard TAO call that's used to give the // client ORB a chance to cleanup the reply that's come back // from the server. - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } - ACE_ENDTRY; } int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -112,18 +110,16 @@ int main (int argc, char* argv[]) } object = - orb->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in ()); object = - orb->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); TimeBase::TimeT mid_value = 10000 * (min_timeout + max_timeout) / 2; // convert from msec to "TimeT" (0.1 usec units) @@ -139,15 +135,13 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_object - ACE_ENV_ARG_PARAMETER); + any_object); object = server->_set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); Simple_Server_var timeout_server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); @@ -167,13 +161,11 @@ int main (int argc, char* argv[]) policy_list.length (0); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - send_echo (none, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); + send_echo (none, orb.in (), server.in (), t); @@ -184,14 +176,12 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_orb - ACE_ENV_ARG_PARAMETER); + any_orb); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - send_echo (orb1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); + send_echo (orb1, orb.in (), server.in (), t); policy_list[0]->destroy (); @@ -207,14 +197,12 @@ int main (int argc, char* argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any_thread - ACE_ENV_ARG_PARAMETER); + any_thread); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - send_echo (thread1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); + send_echo (thread1, orb.in (), server.in (), t); policy_list[0]->destroy (); @@ -226,7 +214,7 @@ 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); + send_echo (object1, orb.in (), timeout_server.in (), t); } ACE_DEBUG ((LM_DEBUG, @@ -234,13 +222,11 @@ int main (int argc, char* argv[]) "resynch with server\n")); policy_list.length (0); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); policy_current->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); - send_echo (none, orb.in (), server.in (), 0 ACE_ENV_ARG_PARAMETER); + send_echo (none, orb.in (), server.in (), 0); server->shutdown (); @@ -267,11 +253,10 @@ int main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 77bb03774c2..ee46faa451c 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -55,7 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -66,7 +66,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -89,12 +89,10 @@ main (int argc, char *argv[]) // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index aa56ccb5862..c4da7f0887c 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -17,8 +17,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) CORBA::Long Simple_Server_i::echo (CORBA::Long x, - CORBA::Long msecs - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long msecs) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000); @@ -44,5 +43,5 @@ Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h index 3a8aecfe32c..8a135bdd767 100644 --- a/TAO/tests/Timeout/test_i.h +++ b/TAO/tests/Timeout/test_i.h @@ -32,8 +32,7 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, - CORBA::Long msecs - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long msecs) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index 6d9f5018af2..3dc9e95919e 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -38,12 +38,10 @@ Current_Test_Impl::test_transport_current (void) } CORBA::Object_var tcobject = - orb_->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("TAO::Transport::Current"); TAO::Transport::Current_var tc = - TAO::Transport::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); + TAO::Transport::Current::_narrow (tcobject.in ()); if (TAO_debug_level >= 1) { @@ -76,21 +74,20 @@ void Current_Test_Impl::invoked_by_client (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { this->invoked_by_client_i (); } - ACE_CATCH (TAO::Transport::NoContext, ex) + catch (const TAO::Transport::NoContext& ex) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) server - Caught a Transport::NoContext exception\n"))); } - ACE_CATCH (CORBA::SystemException, ex1) + catch (const CORBA::SystemException& ex1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) server - Caught a CORBA::SystemException exception\n"))); } - ACE_ENDTRY; } void @@ -107,19 +104,17 @@ Current_Test_Impl::invoked_by_client_i (void) if (this->do_collocated_calls_) { CORBA::Object_var selfobject = - poa_->servant_to_reference (this - ACE_ENV_SINGLE_ARG_DECL); + poa_->servant_to_reference (this); Test::Transport::CurrentTest_var self = - Test::Transport::CurrentTest::_narrow (selfobject.in () - ACE_ENV_SINGLE_ARG_DECL); + Test::Transport::CurrentTest::_narrow (selfobject.in ()); if (TAO_debug_level >= 1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) server - Testing a collocated call\n"))); } - self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER); + self->invoked_during_upcall (); } else { @@ -152,6 +147,5 @@ Current_Test_Impl::shutdown (void) ACE_TEXT ("(%P|%t) server - shutting down.\n"))); } - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp index 453dfd2136f..244c46764e4 100644 --- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp +++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp @@ -10,8 +10,7 @@ int server_main (int argc, Test::Server_Request_Interceptor *cri); int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, +test_transport_current (CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); int diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp index 2746c9f04e9..abaa7635727 100644 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp @@ -9,8 +9,7 @@ using namespace TAO; /// or a client-side interceptor int -test_transport_current (Transport::Current_ptr tc - ACE_ENV_ARG_DECL) +test_transport_current (Transport::Current_ptr tc) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { @@ -36,19 +35,16 @@ test_transport_current (Transport::Current_ptr tc } int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) +test_transport_current (CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { // Get the Current object. CORBA::Object_var tcobject = - orb->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("TAO::Transport::Current"); Transport::Current_var tc = - Transport::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); + Transport::Current::_narrow (tcobject.in ()); if (CORBA::is_nil (tc.in ())) { @@ -56,7 +52,7 @@ test_transport_current (CORBA::ORB_ptr orb ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ") ACE_TEXT ("TAOTransportCurrent object.\n"))); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } return test_transport_current (tc.in ()); diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index 1d2d4c20578..65be75cb715 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -20,8 +20,7 @@ ACE_RCSID (PICurrent, // Prototype int -test_transport_current (CORBA::ORB_ptr - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, +test_transport_current (CORBA::ORB_ptr) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); using namespace TAO; @@ -108,7 +107,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server, int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { for (int i = 0; i < this->niterations_; ++i) @@ -124,8 +123,7 @@ Worker::svc (void) ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n"))); CORBA::Request_var request = - this->server_->_request ("invoked_by_client" - ACE_ENV_ARG_PARAMETER); + this->server_->_request ("invoked_by_client"); request->set_return_type (CORBA::_tc_void); @@ -144,12 +142,10 @@ Worker::svc (void) i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception raised"); + ex._tao_print_exception ("Client: exception raised"); } - ACE_ENDTRY; return 0; } @@ -160,8 +156,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { #if TAO_HAS_TRANSPORT_CURRENT == 1 - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Test::Client_Request_Interceptor* cri = 0; ACE_NEW_RETURN (cri, @@ -176,14 +171,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer); - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - CLIENT_ORB_ID - ACE_ENV_ARG_PARAMETER); + CLIENT_ORB_ID); if (parse_args (argc, argv) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -192,9 +185,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); - ACE_TRY + try { - test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); + test_transport_current (orb.in ()); ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client (%P|%t) ERROR: ") @@ -203,20 +196,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TEXT (" Expected exception was not thrown\n")), -1); } - ACE_CATCH (Transport::NoContext, ex) + catch (const Transport::NoContext& ) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ") ACE_TEXT ("to access traits outside the ") ACE_TEXT ("interceptor or upcall context.\n"))); } - ACE_ENDTRY; // Resolve the target object - CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object (ior); Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + Test::Transport::CurrentTest::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -287,13 +279,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure")))); return result; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Client: Transport Current test (client-side) failed:")); + ex._tao_print_exception ( + ACE_TEXT ( + "Client: Transport Current test (client-side) failed:")); return -1; } - ACE_ENDTRY; #else /* TAO_HAS_TRANSPORT_CURRENT == 1 */ ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n"))); diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 9e5ede623f8..9cf0a5f5c7b 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -85,16 +85,14 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception raised"); + ex._tao_print_exception ("Server: exception raised"); } - ACE_ENDTRY; return 0; } @@ -110,8 +108,7 @@ server_main (int argc, #if TAO_HAS_TRANSPORT_CURRENT == 1 - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, @@ -120,22 +117,18 @@ server_main (int argc, PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer); - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - ACE_TEXT ("test_orb") - ACE_ENV_ARG_PARAMETER); + ACE_TEXT ("test_orb")); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -158,8 +151,7 @@ server_main (int argc, obj = server_impl._this (); Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Test::Transport::CurrentTest::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -168,7 +160,7 @@ server_main (int argc, -1); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) @@ -215,7 +207,7 @@ server_main (int argc, ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); - root_poa->destroy (1, 1 ACE_ENV_SINGLE_ARG_PARAMETER); + root_poa->destroy (1, 1); server->shutdown (); @@ -224,14 +216,12 @@ server_main (int argc, orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Server (%P|%t) ERROR: ")); + ex._tao_print_exception (ACE_TEXT ("Server (%P|%t) ERROR: ")); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n"))); return 0; diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index b43390afcd9..6221c47dcc3 100644 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ b/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -19,8 +19,7 @@ testCurrentORBInitializer (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to create orb\n")), -1); CORBA::Object_var obj = - orb->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("TAO::Transport::Current"); 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 2f15e258a11..bb9e52f8542 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -40,18 +40,16 @@ Current_Test_Impl::test_transport_current (void) } CORBA::Object_var tcobject = - this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current"); TAO::Transport::IIOP::Current_var tc = - TAO::Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); + TAO::Transport::IIOP::Current::_narrow (tcobject.in ()); if (CORBA::is_nil (tc.in())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to narrow down to TAO::Transport::IIOP::Current\n"))); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } CORBA::String_var rhost (tc->remote_host ()); @@ -83,18 +81,16 @@ Current_Test_Impl::invoked_by_client (void) if (this->do_collocated_calls_) { CORBA::Object_var selfobject = - poa_->servant_to_reference (this - ACE_ENV_SINGLE_ARG_DECL); + poa_->servant_to_reference (this); Test::Transport::CurrentTest_var self = - Test::Transport::CurrentTest::_narrow (selfobject.in () - ACE_ENV_SINGLE_ARG_DECL); + Test::Transport::CurrentTest::_narrow (selfobject.in ()); 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); + self->invoked_during_upcall (); } else { @@ -128,6 +124,5 @@ Current_Test_Impl::shutdown (void) ACE_TEXT ("(%P|%t) server - shutting down.\n"))); } - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp index a35ca98ed51..64dceb697d2 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp @@ -10,8 +10,7 @@ int server_main (int argc, Test::Server_Request_Interceptor *cri); int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, +test_transport_current (CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); int diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 086b88916a4..5356b1fd360 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -34,8 +34,7 @@ namespace Test { /// TAO::Transport::IIOP::Current_ptr - IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); @@ -43,29 +42,24 @@ namespace Test { int tmpargc = 0; CORBA::ORB_var orb = CORBA::ORB_init (tmpargc, 0, - orbid - ACE_ENV_ARG_PARAMETER); + orbid); CORBA::Object_var tcobject = - orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")); - return TAO::Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_ARG_PARAMETER); + return TAO::Transport::IIOP::Current::_narrow (tcobject.in ()); } /// On every request, a client-supplied (via the context) id is used /// as index in an array, where we store the endpoint void - IIOP_Server_Request_Interceptor::push_request_info (size_t requestID - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::push_request_info (size_t requestID) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); TAO::Transport::IIOP::Current_var tc = - resolve_iiop_transport_current (this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + resolve_iiop_transport_current (this->orb_id_.in ()); CORBA::String_var host (tc->remote_host()); EndPoint ep (tc->remote_port(), host.in ()); @@ -114,11 +108,10 @@ namespace Test { } - ACE_TRY + try { TAO::Transport::IIOP::Current_var tc = - resolve_iiop_transport_current (this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + resolve_iiop_transport_current (this->orb_id_.in ()); CORBA::String_var host (tc->remote_host()); EndPoint ep (tc->remote_port(), host.in ()); @@ -133,14 +126,13 @@ namespace Test { return; } } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) + catch (const CORBA::BAD_INV_ORDER& ) { // Last reply after the orb has been shut down. Calling // resolve_iiop_transport_current in this case will cause // BAD_INV_ORDER, so instead we swallow the exception and bid // goodbye. } - ACE_ENDTRY; endPoints_[requestID] = dummy; } @@ -176,12 +168,11 @@ namespace Test { void - IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); - CORBA::String_var op (ri->operation(ACE_ENV_ARG_PARAMETER)); + CORBA::String_var op (ri->operation()); if (TAO_debug_level >=1) ACE_DEBUG ((LM_DEBUG, @@ -189,12 +180,11 @@ namespace Test { name.in (), op.in ())); - ACE_TRY + try { IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag; IOP::ServiceContext_var sc = - ri->get_request_service_context (id - ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast <const char *> (sc->context_data.get_buffer ()); @@ -203,7 +193,7 @@ namespace Test { this->push_request_info (requestID); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s (%P|%t) Service context") @@ -213,19 +203,17 @@ namespace Test { name.in (), op.in ())); } - ACE_ENDTRY; } void - IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast <const char *> (sc->context_data.get_buffer ()); @@ -239,16 +227,15 @@ namespace Test { void - IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_TRY + try { - inbound_process_context (ri ACE_ENV_ARG_PARAMETER); + inbound_process_context (ri); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, @@ -256,24 +243,22 @@ namespace Test { ACE_TEXT(" receive_request_service_contexts.\n"), name.in ())); } - ACE_ENDTRY; - Server_Request_Interceptor::receive_request_service_contexts (ri ACE_ENV_ARG_PARAMETER); + Server_Request_Interceptor::receive_request_service_contexts (ri); } void - IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); + outbound_process_context (ri); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, @@ -281,25 +266,23 @@ namespace Test { ACE_TEXT("send_reply.\n"), name.in ())); } - ACE_ENDTRY; - Server_Request_Interceptor::send_reply (ri ACE_ENV_ARG_PARAMETER); + Server_Request_Interceptor::send_reply (ri); } void - IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_TRY + try { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); + outbound_process_context (ri); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, @@ -308,22 +291,20 @@ namespace Test { name.in ())); } - ACE_ENDTRY; - Server_Request_Interceptor::send_exception (ri ACE_ENV_ARG_PARAMETER); + Server_Request_Interceptor::send_exception (ri); } void - IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_TRY + try { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); + outbound_process_context (ri); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, @@ -331,9 +312,8 @@ namespace Test { ACE_TEXT("send_other.\n"), name.in ())); } - ACE_ENDTRY; - Server_Request_Interceptor::send_other (ri ACE_ENV_ARG_PARAMETER); + Server_Request_Interceptor::send_other (ri); } } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 4be2b3c687c..d87ec6b1f5d 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -59,25 +59,21 @@ namespace Test ACE_THROW_SPEC ((CORBA::SystemException)); /// incomming interception point - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); /// outgoing interception point - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); /// outgoing interception point - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); /// outgoing interception point - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} @@ -86,26 +82,22 @@ namespace Test /// process incomming requests context void inbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); /// process outgoing requests context void outbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); /// saves the incomming request info - void push_request_info (size_t requestID - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void push_request_info (size_t requestID) ACE_THROW_SPEC ((CORBA::SystemException)); /// clears the outgoing request info void pop_request_info (size_t requestID); - TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid - ACE_ENV_ARG_DECL) + TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp index ed4e4bc074e..6544b23169b 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp @@ -22,15 +22,13 @@ using namespace TAO; /// or a client-side interceptor int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) +test_transport_current (CORBA::ORB_ptr orb) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { // Get the Current object. CORBA::Object_var tcobject = - orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")); if (TAO_debug_level >= 1) @@ -38,8 +36,7 @@ test_transport_current (CORBA::ORB_ptr orb ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n"))); Transport::IIOP::Current_var tc = - Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); + Transport::IIOP::Current::_narrow (tcobject.in ()); if (TAO_debug_level >= 1) ACE_DEBUG ((LM_DEBUG, @@ -51,7 +48,7 @@ test_transport_current (CORBA::ORB_ptr orb ACE_TEXT ("Tester (%P|%t) ERROR: Could not resolve ") ACE_TEXT ("TAO::Transport::IIOP::Current object.\n"))); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ::CORBA::String_var rhost (tc->remote_host ()); diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index af40d6d4250..c125e60d0b9 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -20,8 +20,7 @@ ACE_RCSID (IIOP, // Prototype int -test_transport_current (CORBA::ORB_ptr - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, +test_transport_current (CORBA::ORB_ptr) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); using namespace TAO; @@ -108,7 +107,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server, int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { for (int i = 0; i < this->niterations_; ++i) @@ -124,8 +123,7 @@ Worker::svc (void) ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n"))); CORBA::Request_var request = - this->server_->_request ("invoked_by_client" - ACE_ENV_ARG_PARAMETER); + this->server_->_request ("invoked_by_client"); request->set_return_type (CORBA::_tc_void); @@ -144,12 +142,10 @@ Worker::svc (void) i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception raised"); + ex._tao_print_exception ("Client: exception raised"); } - ACE_ENDTRY; return 0; } @@ -160,8 +156,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { #if TAO_HAS_TRANSPORT_CURRENT == 1 - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { Test::Client_Request_Interceptor* cri = 0; ACE_NEW_RETURN (cri, @@ -176,14 +171,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer); - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - CLIENT_ORB_ID - ACE_ENV_ARG_PARAMETER); + CLIENT_ORB_ID); if (parse_args (argc, argv) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -192,9 +185,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); - ACE_TRY + try { - test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); + test_transport_current (orb.in ()); ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client (%P|%t) ERROR: ") @@ -203,20 +196,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TEXT (" Expected exception was not thrown\n")), -1); } - ACE_CATCH (Transport::NoContext, ex) + catch (const Transport::NoContext& ) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ") ACE_TEXT ("to access traits outside the ") ACE_TEXT ("interceptor or upcall context.\n"))); } - ACE_ENDTRY; // Resolve the target object - CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object (ior); Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + Test::Transport::CurrentTest::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -285,13 +277,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure")))); return result; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Client: Transport Current test (client-side) failed:")); + ex._tao_print_exception ( + ACE_TEXT ( + "Client: Transport Current test (client-side) failed:")); return -1; } - ACE_ENDTRY; #else /* TAO_HAS_TRANSPORT_CURRENT == 1 */ ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n"))); diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index 72f4bf3076a..f2c42df3512 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -85,16 +85,14 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception raised"); + ex._tao_print_exception ("Server: exception raised"); } - ACE_ENDTRY; return 0; } @@ -110,8 +108,7 @@ server_main (int argc, #if TAO_HAS_TRANSPORT_CURRENT == 1 - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { PortableInterceptor::ORBInitializer_ptr temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, @@ -120,22 +117,18 @@ server_main (int argc, PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer); - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - ACE_TEXT ("test_orb") - ACE_ENV_ARG_PARAMETER); + ACE_TEXT ("test_orb")); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -158,8 +151,7 @@ server_main (int argc, obj = server_impl._this (); Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Test::Transport::CurrentTest::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -168,7 +160,7 @@ server_main (int argc, -1); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) @@ -216,14 +208,12 @@ server_main (int argc, orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Server (%P|%t) ERROR: ")); + ex._tao_print_exception (ACE_TEXT ("Server (%P|%t) ERROR: ")); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n"))); return 0; diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index 79fc22d1eb4..3f134825124 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -29,7 +29,7 @@ Object_Factory_i::create_first (void) CORBA::NO_MEMORY() ); Two_Objects_Test::First_var first = - first_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER ); + first_impl->_this ( ); return first._retn(); } diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index 63d61f9b4ce..828e9b67d22 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -59,5 +59,5 @@ Second_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp index aedd4b27658..7591fa100b9 100644 --- a/TAO/tests/Two_Objects/client.cpp +++ b/TAO/tests/Two_Objects/client.cpp @@ -37,13 +37,12 @@ int main (int argc, char *argv[]) { // Used to declare the CORBA::Environment variable - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse the arguments if (parse_args (argc, argv) != 0) @@ -53,12 +52,11 @@ main (int argc, char *argv[]) // The object reference obtained is a reference to the factory // object. CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); // 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); + Two_Objects_Test::Object_Factory::_narrow(tmp.in ()); if (CORBA::is_nil (factory.in ())) { @@ -88,13 +86,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 07d09da9a72..903166e80ad 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -57,19 +57,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Get initial reference to the Root POA CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); // Narrow down to the appropriate type PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -102,7 +102,7 @@ main (int argc, char *argv[]) // 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); + orb->object_to_string (factory.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -133,17 +133,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index 6c6ad4951fc..e3de9ceefa2 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -13,20 +13,17 @@ Worker::Worker (CORBA::ORB_ptr orb, int time) int Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value tv (orb_timeout_); // orb times out after <timeout> seconds - this->orb_->run (tv ACE_ENV_ARG_PARAMETER); + this->orb_->run (tv); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp index fc4e714d1af..cea17607721 100644 --- a/TAO/tests/Typedef_String_Array/client.cpp +++ b/TAO/tests/Typedef_String_Array/client.cpp @@ -36,19 +36,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); SimpleStrings_var server = - SimpleStrings::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + SimpleStrings::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -59,7 +59,7 @@ main (int argc, char *argv[]) } ArrayOfString_var the_strings; - server->get_strings (the_strings.out () ACE_ENV_ARG_PARAMETER); + server->get_strings (the_strings.out ()); for(size_t i = 0; i < 15; i++) { @@ -68,13 +68,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 7564cf6e0ce..882a15f1834 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -50,7 +50,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -63,7 +63,7 @@ main (int argc, char *argv[]) SimpleStrings_var server = test_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,17 +86,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp index a71deedee5f..11f65c2a3be 100644 --- a/TAO/tests/Typedef_String_Array/testImpl.cpp +++ b/TAO/tests/Typedef_String_Array/testImpl.cpp @@ -27,8 +27,7 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb) void -TestImpl::get_strings (ArrayOfString_out strings - ACE_ENV_ARG_DECL_NOT_USED) +TestImpl::get_strings (ArrayOfString_out strings) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (strings, ArrayOfString); diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h index dc1c3e5b890..be1e7cb1c69 100644 --- a/TAO/tests/Typedef_String_Array/testImpl.h +++ b/TAO/tests/Typedef_String_Array/testImpl.h @@ -7,8 +7,7 @@ class TestImpl: public POA_SimpleStrings public: TestImpl(CORBA::ORB_ptr orb); - virtual void get_strings (ArrayOfString_out strings - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void get_strings (ArrayOfString_out strings) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h index 978e0f3c3b1..206f8899825 100644 --- a/TAO/tests/Xt_Stopwatch/Client.h +++ b/TAO/tests/Xt_Stopwatch/Client.h @@ -47,8 +47,7 @@ public: void add_callback (Control &); // Adds the callbacks to the GUI underneath..... - void parse_args (int argc, char *argv[] - ACE_ENV_ARG_DECL); + void parse_args (int argc, char *argv[]); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index c43297888e8..ad52d1c0d40 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -27,16 +27,15 @@ main (int argc, char *argv[]) Control control (toplevel); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); Client client (orb.in ()); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (argc, argv); client.add_callback (control); @@ -45,12 +44,11 @@ main (int argc, char *argv[]) XtRealizeWidget (toplevel); XtAppMainLoop (app); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } @@ -65,8 +63,7 @@ Client::~Client (void) void Client::parse_args (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { const char *ior = "file://test.ior"; @@ -89,10 +86,10 @@ Client::parse_args (int argc, } CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior); this->server_ = - Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Stopwatch::_narrow (object.in ()); if (CORBA::is_nil(this->server_.in ())) { @@ -140,33 +137,30 @@ Client::stop_callback (Widget /*widget*/, void Client::start_hook (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->server_->start (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception in the start button callback"); + ex._tao_print_exception ( + "Caught an exception in the start button callback"); return; } - ACE_ENDTRY; } void Client::stop_hook (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->server_->stop (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught an exception in the stop button callback"); + ex._tao_print_exception ( + "Caught an exception in the stop button callback"); return; } - ACE_ENDTRY; } diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index deb87bb021f..bc6fa6e49a5 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -63,15 +63,14 @@ main (int argc, char *argv[]) Stopwatch_display stopwatch (toplevel); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,7 +78,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -95,7 +94,7 @@ main (int argc, char *argv[]) server_impl._this (); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -127,13 +126,11 @@ main (int argc, char *argv[]) orb->run (); #endif /*ACE_HAS_THREADS*/ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } |