diff options
Diffstat (limited to 'TAO/tests')
583 files changed, 5114 insertions, 5114 deletions
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index 3745bc069ea..4586a4d67a1 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -33,7 +33,7 @@ CORBA::Long AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, A::DidTheRightThing)) { @@ -58,7 +58,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void -AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); @@ -66,7 +66,7 @@ AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Long -AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -77,7 +77,7 @@ AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void AMI_Test_i::yadda (CORBA::Long yadda - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index 8e877174b25..719c9e34f88 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -38,18 +38,18 @@ public: CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, A::DidTheRightThing)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long yadda (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void yadda (CORBA::Long yadda - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 3dfd4a579a1..6fb873efd42 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -100,7 +100,7 @@ public: void foo (CORBA::Long result, CORBA::Long out_l - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -115,7 +115,7 @@ public: }; void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -123,7 +123,7 @@ public: "Callback method <foo_excep> called: \n")); ACE_TRY { - excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -136,7 +136,7 @@ public: }; void get_yadda (CORBA::Long result - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -145,14 +145,14 @@ public: }; void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -160,7 +160,7 @@ public: }; void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -175,22 +175,22 @@ Handler handler; int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; A::AMI_Test_var server = - A::AMI_Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -204,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" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -213,14 +213,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Let the client perform the test in a separate thread @@ -248,12 +248,12 @@ main (int argc, char *argv[]) while (number_of_replies > 0) { CORBA::Boolean pending = - orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (pending) { - orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -274,10 +274,10 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -298,7 +298,7 @@ Client::Client (A::AMI_Test_ptr server, : ami_test_var_ (A::AMI_Test::_duplicate (server)), niterations_ (niterations) { - the_handler_var_ = handler._this (/* TAO_ENV_SINGLE_ARG_PARAMETER */); + the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */); } int @@ -313,7 +313,7 @@ Client::svc (void) ami_test_var_->sendc_foo (the_handler_var_.in (), number, "Let's talk AMI." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (debug) diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index da4274ab73f..44845b90c46 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -56,15 +56,15 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -73,11 +73,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -86,11 +86,11 @@ main (int argc, char *argv[]) AMI_Test_i ami_test_i (orb.in ()); A::AMI_Test_var ami_test_var = - ami_test_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (ami_test_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -108,18 +108,18 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index b203a92e2c7..c1081426714 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -83,7 +83,7 @@ public: void foo (CORBA::Long ami_return_val, CORBA::Long out_l - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) @@ -96,7 +96,7 @@ public: }; void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -105,7 +105,7 @@ public: "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (A::DidTheRightThing, ex) @@ -124,7 +124,7 @@ public: void get_yadda (CORBA::Long result - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -133,14 +133,14 @@ public: }; void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; - void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -148,7 +148,7 @@ public: }; void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -161,38 +161,38 @@ int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object_var = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa_var = - PortableServer::POA::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; // We reuse the object_var smart pointer! - object_var = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; A::AMI_Test_var ami_test_var = - A::AMI_Test::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER); + A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ami_test_var.in ())) @@ -206,7 +206,7 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (TAO_ENV_SINGLE_ARG_PARAMETER); + handler._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try out sending asynchronous messages without a reply handler @@ -215,7 +215,7 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (), 0, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -227,7 +227,7 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), 0, "Let's talk AMI." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Long l = 931247; @@ -241,22 +241,22 @@ main (int argc, char *argv[]) ami_test_var->sendc_foo (the_handler_var.in (), l, "Let's talk AMI." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Begin test of attributes ami_test_var->sendc_get_yadda (the_handler_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ami_test_var->sendc_set_yadda (the_handler_var.in (), 4711 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ami_test_var->sendc_get_yadda (the_handler_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // End test of attributes @@ -281,7 +281,7 @@ main (int argc, char *argv[]) CORBA::Long number = ami_test_var->foo (l, l, "Let's talk SMI." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (debug) @@ -293,16 +293,16 @@ main (int argc, char *argv[]) if (shutdown_flag) { - ami_test_var->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } poa_var->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index 9d7ab0a4455..9719e14472c 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -14,28 +14,28 @@ AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb, void AMI_Buffering::receive_data (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER); + this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER); } void -AMI_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -AMI_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL) +AMI_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER); + this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); } void -AMI_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL) +AMI_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index 52614d58731..1ab2f42e125 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -27,16 +27,16 @@ public: // = The skeleton methods virtual void receive_data (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (TAO_ENV_SINGLE_ARG_DECL) + virtual void flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (TAO_ENV_SINGLE_ARG_DECL) + virtual void sync (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index 9f258445acd..ccc6b54b6b1 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -13,14 +13,14 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) } CORBA::ULong -AMI_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong -AMI_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; @@ -28,7 +28,7 @@ AMI_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void AMI_Buffering_Admin::request_received (CORBA::ULong payload_length - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; @@ -36,14 +36,14 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length } void -AMI_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AMI_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -AMI_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +AMI_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index f3f3d305fbc..acc8e49201f 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -25,20 +25,20 @@ public: AMI_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_received (CORBA::ULong payload_length - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (TAO_ENV_SINGLE_ARG_DECL) + virtual void flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp index e515a0b11a4..6f49c529d36 100644 --- a/TAO/tests/AMI_Buffering/Client_Task.cpp +++ b/TAO/tests/AMI_Buffering/Client_Task.cpp @@ -23,14 +23,14 @@ int Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { while (1) { // run the even loop for 1 second... ACE_Time_Value tv (1, 0); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp index c07882c69ce..7666e09cd4d 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -10,19 +10,19 @@ Reply_Handler::Reply_Handler (void) } void -Reply_Handler::receive_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::receive_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_receive_data (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_receive_data (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -34,19 +34,19 @@ Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holde } void -Reply_Handler::sync (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_sync (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_sync (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -58,19 +58,19 @@ Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder } void -Reply_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Reply_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index fe3b6df4fab..6159fc6a126 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -25,22 +25,22 @@ public: Reply_Handler (void); // = The skeleton methods - virtual void receive_data (TAO_ENV_SINGLE_ARG_DECL) + virtual void receive_data (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (TAO_ENV_SINGLE_ARG_DECL) + virtual void sync (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index c4bc16203d6..d70c351695a 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl); Test::AMI_Buffering_Admin_var AMI_buffering_admin = - AMI_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AMI_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (AMI_buffering_admin.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (AMI_buffering_admin.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 1b3841c5af7..2708b9178b2 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -89,24 +89,24 @@ int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr oneway_buffering, Test::AMI_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) @@ -115,15 +115,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -132,21 +132,21 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::AMI_Buffering_var ami_buffering = - Test::AMI_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ami_buffering.in ())) @@ -158,11 +158,11 @@ main (int argc, char *argv[]) } tmp = - orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::AMI_Buffering_Admin_var ami_buffering_admin = - Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ami_buffering_admin.in ())) @@ -187,7 +187,7 @@ main (int argc, char *argv[]) run_message_count (orb.in (), ami_buffering.in (), ami_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_timeout_test) @@ -198,7 +198,7 @@ main (int argc, char *argv[]) run_timeout (orb.in (), ami_buffering.in (), ami_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_timeout_reactive_test) @@ -209,7 +209,7 @@ main (int argc, char *argv[]) run_timeout_reactive (orb.in (), ami_buffering.in (), ami_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_buffer_size_test) @@ -220,7 +220,7 @@ main (int argc, char *argv[]) run_buffer_size (orb.in (), ami_buffering.in (), ami_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -233,16 +233,16 @@ main (int argc, char *argv[]) client_task.thr_mgr ()->wait (); - ami_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ami_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -261,14 +261,14 @@ configure_policies (CORBA::ORB_ptr orb, const TAO::BufferingConstraint &buffering_constraint, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_out flusher - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy_current.in ())) @@ -286,21 +286,21 @@ configure_policies (CORBA::ORB_ptr orb, policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO::BufferingConstraint flush_constraint; @@ -314,20 +314,20 @@ configure_policies (CORBA::ORB_ptr orb, policies[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = ami_buffering->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); flusher = - Test::AMI_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -336,17 +336,17 @@ configure_policies (CORBA::ORB_ptr orb, void sync_server (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr flusher - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get back in sync with the server... - flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER); + flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER); + flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Drain responses from the queue ACE_Time_Value tv (0, 100000); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -356,17 +356,17 @@ run_liveness_test (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_ptr flusher, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; // Get back in sync with the server... - sync_server (orb, flusher TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong send_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int liveness_test_iterations = int(send_count); @@ -381,12 +381,12 @@ run_liveness_test (CORBA::ORB_ptr orb, { ami_buffering->sendc_receive_data (reply_handler, payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Once the system has sent enough messages we don't @@ -404,13 +404,13 @@ run_liveness_test (CORBA::ORB_ptr orb, "expected %u\n", i, receive_count, expected)); - sync_server (orb, flusher TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } if (depth++ == LIVENESS_MAX_DEPTH) { - sync_server (orb, flusher TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); depth = 0; @@ -424,7 +424,7 @@ int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; @@ -436,7 +436,7 @@ run_message_count (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -454,17 +454,17 @@ run_message_count (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -479,12 +479,12 @@ run_message_count (CORBA::ORB_ptr orb, { ami_buffering->sendc_receive_data (reply_handler.in (), payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong iteration_count = @@ -524,7 +524,7 @@ run_message_count (CORBA::ORB_ptr orb, ami_buffering, flusher.in (), ami_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -537,7 +537,7 @@ int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -549,7 +549,7 @@ run_timeout (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -567,17 +567,17 @@ run_timeout (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -593,12 +593,12 @@ run_timeout (CORBA::ORB_ptr orb, { ami_buffering->sendc_receive_data (reply_handler.in (), payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; @@ -638,7 +638,7 @@ run_timeout (CORBA::ORB_ptr orb, ami_buffering, flusher.in (), ami_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -651,7 +651,7 @@ int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -663,7 +663,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -681,17 +681,17 @@ run_timeout_reactive (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -707,18 +707,18 @@ run_timeout_reactive (CORBA::ORB_ptr orb, { ami_buffering->sendc_receive_data (reply_handler.in (), payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; } while (1) { CORBA::ULong receive_count = - ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value sleep (0, 10000); - orb->run (sleep TAO_ENV_ARG_PARAMETER); + orb->run (sleep ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; @@ -759,7 +759,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, ami_buffering, flusher.in (), ami_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -774,7 +774,7 @@ int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; @@ -786,7 +786,7 @@ run_buffer_size (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, ami_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -802,17 +802,17 @@ run_buffer_size (CORBA::ORB_ptr orb, PortableServer::ServantBase_var owner_transfer(reply_handler_impl); Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_bytes_received = - ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_bytes_received != bytes_sent) @@ -827,12 +827,12 @@ run_buffer_size (CORBA::ORB_ptr orb, { ami_buffering->sendc_receive_data (reply_handler.in (), payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = - ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER); + ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong payload_delta = @@ -877,7 +877,7 @@ run_buffer_size (CORBA::ORB_ptr orb, ami_buffering, flusher.in (), ami_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index 469c863e865..80ea86a110e 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -45,15 +45,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -62,18 +62,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::AMI_Buffering_Admin_var admin = - Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (admin.in ())) @@ -92,11 +92,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl); Test::AMI_Buffering_var AMI_buffering = - AMI_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AMI_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (AMI_buffering.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (AMI_buffering.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -109,18 +109,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 104925ce803..d3f7271a568 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -65,22 +65,22 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TimeoutObj_var timeout_var = - TimeoutObj::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + TimeoutObj::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (timeout_var.in ())) @@ -94,7 +94,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -103,21 +103,21 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -130,19 +130,19 @@ main (int argc, char *argv[]) client.activate (); // ORB loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); // Fetch responses + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); // Fetch responses ACE_TRY_CHECK; root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for all the threads to finish before destroying the // ORB. (void) client.thr_mgr ()->wait (); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index c9ea325ae42..0b15c0c4672 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -56,15 +56,15 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -73,11 +73,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -86,11 +86,11 @@ main (int argc, char *argv[]) Timeout_i timeout_i (orb.in ()); TimeoutObj_var timeout_var = - timeout_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + timeout_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (timeout_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -108,14 +108,14 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -128,7 +128,7 @@ main (int argc, char *argv[]) client->activate (); */ - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -136,10 +136,10 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; //delete client; diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index a8b55d47f0b..32a7b694eaa 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -44,7 +44,7 @@ TimeoutClient::svc () { this->initialize (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,14 +61,14 @@ TimeoutClient::svc () this->none_test (); // shut down remote ORB - timeoutObject_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw ACE_OS::sleep (tv); // shut down local ORB - orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -87,16 +87,16 @@ TimeoutClient::svc () int TimeoutClient::initialize () { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var object = orb_->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager_ = - CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -131,7 +131,7 @@ TimeoutClient::send (CORBA::Boolean async, CORBA::PolicyList policy_list (1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX (normal) { if (local_timeout != 0) @@ -145,12 +145,12 @@ TimeoutClient::send (CORBA::Boolean async, policy_list[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_orb - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (normal); policy_manager_->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (normal); } else @@ -158,7 +158,7 @@ TimeoutClient::send (CORBA::Boolean async, policy_list.length (0); policy_manager_->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (normal); } @@ -170,12 +170,12 @@ TimeoutClient::send (CORBA::Boolean async, { timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (), remote_sleep - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else // synch { timeoutObject_->sendTimeToWait (remote_sleep - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK_EX (normal); } @@ -196,7 +196,7 @@ TimeoutClient::send (CORBA::Boolean async, { if (local_timeout != 0) { - policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (cleanup); } } diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp index 45727ec7e6f..d15659f9208 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp @@ -30,7 +30,7 @@ Timeout_i::~Timeout_i () void Timeout_i::sendTimeToWait (CORBA::Long msec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, @@ -48,7 +48,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec } void -Timeout_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Timeout_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (); @@ -72,7 +72,7 @@ TimeoutHandler_i::~TimeoutHandler_i () } void -TimeoutHandler_i::sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -83,14 +83,14 @@ TimeoutHandler_i::sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { timer_.stop (); ACE_TRY { - excep_holder->raise_sendTimeToWait (TAO_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_sendTimeToWait (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TIMEOUT, timeout) diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h index 0b2742dac01..ccf4816da42 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.h +++ b/TAO/tests/AMI_Timeouts/timeout_i.h @@ -33,10 +33,10 @@ public: ~Timeout_i (); virtual void sendTimeToWait (CORBA::Long msec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -52,12 +52,12 @@ public: ~TimeoutHandler_i (); - virtual void sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL) + virtual void sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void sendTimeToWait_excep ( AMI_TimeoutObjExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void reset_reply_counter (); diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index f6658882d03..a5cec1f517b 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -44,11 +44,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -57,11 +57,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the childPOA to be created. @@ -73,7 +73,7 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA @@ -83,7 +83,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. @@ -91,22 +91,22 @@ main (int argc, char *argv[]) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -121,17 +121,17 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); Callback_var callback = - callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Send the calback object to the server server->callback_object (callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // A method to kickstart callbacks from the server CORBA::Long r = - server->test_method (1 TAO_ENV_ARG_PARAMETER); + server->test_method (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) @@ -141,10 +141,10 @@ main (int argc, char *argv[]) r)); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index fd5c272ead5..5feeadfd930 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -44,11 +44,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -57,11 +57,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the childPOA to be created. @@ -73,7 +73,7 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA @@ -83,7 +83,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. @@ -91,11 +91,11 @@ main (int argc, char *argv[]) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -109,16 +109,16 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), &server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -142,23 +142,23 @@ main (int argc, char *argv[]) // Just process one upcall. We know that we would get the // clients IOR in that call. CORBA::Boolean pending = - orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (pending) { - orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Now that hopefully we have the clients IOR, just start // making remote calls to the client. - retval = server_impl.call_client (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index e0afb927c2c..8203a116ce5 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -14,15 +14,15 @@ ACE_RCSID(BiDirectional, test_i, "$Id$") void -Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } void -Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -34,7 +34,7 @@ Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_A CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback - TAO_ENV_ARG_DECL_NOT_USED ) + 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -55,13 +55,13 @@ Simple_Server_i::callback_object (Callback_ptr callback } int -Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL) { if (this->flag_) { for (int times = 0; times < this->no_iterations_; ++times) { - this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) @@ -73,7 +73,7 @@ Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL) } } - this->callback_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->flag_ = 0; @@ -85,8 +85,8 @@ Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL) void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 6dbdd7c79a5..d66809ff118 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -31,11 +31,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (TAO_ENV_SINGLE_ARG_DECL) + void callback_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -59,17 +59,17 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void callback_object (Callback_ptr callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - int call_client (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index b119fd6e7cb..8fb72a19b5a 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -45,11 +45,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -58,11 +58,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the childPOA to be created. @@ -74,7 +74,7 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA @@ -84,7 +84,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. @@ -92,22 +92,22 @@ main (int argc, char *argv[]) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -126,18 +126,18 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); Callback_var callback = - callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Send the calback object to the server server->callback_object (callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Call the client that will make remote calls CORBA::Long r = - server->test_method (1 TAO_ENV_ARG_PARAMETER); + server->test_method (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) @@ -148,10 +148,10 @@ main (int argc, char *argv[]) } // Shtdown the server - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index 9623dcf960f..046e54367a1 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -44,11 +44,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -57,11 +57,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the childPOA to be created. @@ -73,7 +73,7 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA @@ -83,7 +83,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. @@ -91,11 +91,11 @@ main (int argc, char *argv[]) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -114,16 +114,16 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -142,12 +142,12 @@ main (int argc, char *argv[]) } // Run the event loop - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 04289ca3616..d4caa76da5e 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -13,15 +13,15 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void -Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } void -Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -33,7 +33,7 @@ Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_A CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) @@ -46,7 +46,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback times < this->no_iterations_; ++times) { - this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) @@ -64,7 +64,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object @@ -73,8 +73,8 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index f8424b7272f..47f5f0c57bf 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -32,11 +32,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (TAO_ENV_SINGLE_ARG_DECL) + void callback_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -60,14 +60,14 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void callback_object (Callback_ptr callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 60a43593f69..6b6b332a9cc 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -30,7 +30,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, CORBA::ULong thread_count, CORBA::ULong message_count, Test::Session_List &session_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { session_list.length (this->peer_count_); CORBA::ULong count = 0; @@ -44,13 +44,13 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, thread_count, message_count, this->peer_count_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) +Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; @@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -72,7 +72,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) void Coordinator::add_peer (Test::Peer_ptr peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 48f5180eb78..0c8211c09b2 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -36,14 +36,14 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, Test::Session_List &session_list - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Shutdown all the peers - void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index c4bd8a20639..3ffb1bf388f 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -21,7 +21,7 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl; @@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control, ACE_CHECK_RETURN (Test::Session::_nil ()); PortableServer::ServantBase_var transfer_ownership (session_impl); - return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -47,5 +47,5 @@ Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h index 41ab681be6f..8069d439665 100644 --- a/TAO/tests/Big_Oneways/Peer.h +++ b/TAO/tests/Big_Oneways/Peer.h @@ -33,9 +33,9 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index dc1ed674ba4..f2abce4d041 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -36,7 +36,7 @@ Session::svc (void) /// thread PortableServer::ServantBase_var auto_decrement (this); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -53,7 +53,7 @@ Session::svc (void) CORBA::ULong session_count = this->other_sessions_.length (); - this->validate_connections (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != this->message_count_; ++i) @@ -70,7 +70,7 @@ Session::svc (void) for (CORBA::ULong j = 0; j != session_count; ++j) { this->other_sessions_[j]->receive_payload (payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -83,7 +83,7 @@ Session::svc (void) return 0; } } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -97,7 +97,7 @@ Session::svc (void) } void -Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL) +Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ULong session_count = this->other_sessions_.length (); @@ -107,7 +107,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->other_sessions_[j]->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; @@ -117,7 +117,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL) void Session::start (const Test::Session_List &other_sessions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)) @@ -138,12 +138,12 @@ Session::start (const Test::Session_List &other_sessions // access to this object.... ACE_TRY { - this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->task_.activate ( THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) { - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -170,17 +170,17 @@ 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 TAO_ENV_ARG_PARAMETER); + this->terminate (0 ACE_ENV_ARG_PARAMETER); } void -Session::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) +Session::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Session::receive_payload (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) @@ -217,23 +217,23 @@ Session::receive_payload (const Test::Payload &the_payload if (this->more_work ()) return; } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); } void -Session::destroy (TAO_ENV_SINGLE_ARG_DECL) +Session::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -250,14 +250,14 @@ Session::more_work (void) const void Session::terminate (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { // Make sure that global resources are released ACE_TRY_EX(GLOBAL) { this->control_->session_finished (success - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(GLOBAL); } ACE_CATCHANY diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 62dcd896fa5..ff450c1ff47 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -37,26 +37,26 @@ public: // = The skeleton methods virtual void start (const Test::Session_List &other_sessions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)); - virtual void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_payload (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: /// Helper function used to report any problems and destroy local /// resources void terminate (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()); /// Return 1 if all the work in this session has been completed @@ -64,7 +64,7 @@ private: /// Make sure that all threads have connections avaiable to the /// other sessions. - void validate_connections (TAO_ENV_SINGLE_ARG_DECL); + void validate_connections (ACE_ENV_SINGLE_ARG_DECL); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index 62a77e985b3..5b5c2e8ee44 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -42,7 +42,7 @@ Session_Control::~Session_Control (void) void Session_Control::session_finished (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success if (session_count_ == 0) { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h index 3f3dfcab3f9..a574ec4134f 100644 --- a/TAO/tests/Big_Oneways/Session_Control.h +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -35,7 +35,7 @@ public: // = The skeleton methods virtual void session_finished (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 1b90a459f6f..ed04da64896 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -57,18 +57,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Coordinator_var coordinator = - Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -86,24 +86,24 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var peer_owner_transfer(peer_impl); Test::Peer_var peer = - peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER); + coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 20111f3eabe..183124a1e5d 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -64,15 +64,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -81,7 +81,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -94,11 +94,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl); Test::Coordinator_var coordinator = - coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -111,7 +111,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); @@ -120,7 +120,7 @@ main (int argc, char *argv[]) ++i) { ACE_Time_Value tv (1, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -139,7 +139,7 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl); Test::Session_Control_var session_control = - session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test::Session_List session_list; @@ -148,7 +148,7 @@ main (int argc, char *argv[]) thread_count, message_count, session_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (session_list.length () == peer_count); @@ -169,7 +169,7 @@ main (int argc, char *argv[]) } session_list[j]->start (other_sessions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -180,7 +180,7 @@ main (int argc, char *argv[]) ++k) { ACE_Time_Value tv (1, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -195,18 +195,18 @@ main (int argc, char *argv[]) for (j = 0; j != peer_count; ++j) { - session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp index 58960000cef..40b9cca6846 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Test::Octet_Seq_var reply_mesg = @@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_AR } void -Big_Reply_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Big_Reply_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Big_Reply_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index ab73819e6e3..69edbcbe236 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -40,13 +40,13 @@ public: virtual ~Big_Reply_i (void); // = The skeleton methods - virtual Test::Octet_Seq *get_big_reply (TAO_ENV_SINGLE_ARG_DECL) + virtual Test::Octet_Seq *get_big_reply (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (TAO_ENV_SINGLE_ARG_DECL) + virtual void ping (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index ff78b52259f..2a979dede09 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -31,7 +31,7 @@ Client_Task::svc (void) { for (int i = 0; i != this->event_count_; ++i) { - this->reply_gen_->get_big_reply (TAO_ENV_SINGLE_ARG_PARAMETER); + this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -63,7 +63,7 @@ Client_Task::validate_connection (void) ACE_TRY { - this->reply_gen_->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 2ada7182cf3..803b5db7e89 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -38,18 +38,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Big_Reply_var reply_gen = - Test::Big_Reply::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (reply_gen.in ())) @@ -73,7 +73,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index e00ea261bfc..9aa133ddf4f 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -43,11 +43,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -56,11 +56,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -78,12 +78,12 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen); Test::Big_Reply_var big_reply = - big_reply_gen->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + big_reply_gen->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (big_reply.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -96,13 +96,13 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index 399aa4e0e41..dc8712a9176 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -30,18 +30,18 @@ Client_Task::svc (void) for (CORBA::ULong j = 0; j != payload.length (); ++j) payload[j] = (j % 256); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any scope_as_any; @@ -53,17 +53,17 @@ Client_Task::svc (void) policy_list[0] = this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != this->event_count_; ++i) { - this->payload_receiver_->more_data (payload TAO_ENV_ARG_PARAMETER); + this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -76,13 +76,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { for (int i = 0; i != 100; ++i) { - (void) this->payload_receiver_->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) this->payload_receiver_->get_message_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index a543a408097..6d6fbde41d5 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -32,7 +32,7 @@ public: private: /// Make sure that all threads have connections available to /// workaround bug 189 - void validate_connection (TAO_ENV_SINGLE_ARG_DECL); + void validate_connection (ACE_ENV_SINGLE_ARG_DECL); 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 86d6c47f73d..85bfb412706 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -13,7 +13,7 @@ Payload_Receiver::Payload_Receiver (void) void Payload_Receiver::more_data (const Test::Payload &payload - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->message_count_++; @@ -21,7 +21,7 @@ Payload_Receiver::more_data (const Test::Payload &payload } CORBA::Long -Payload_Receiver::get_message_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Payload_Receiver::get_message_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->message_count_; diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h index 4675c2e2b30..db7e351b53e 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -29,9 +29,9 @@ public: // = The skeleton methods virtual void more_data (const Test::Payload &payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_message_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_message_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index 52518c3d9bc..9c3764458d8 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Payload_Receiver_var payload_receiver = - Test::Payload_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (payload_receiver.in ())) @@ -96,20 +96,20 @@ main (int argc, char *argv[]) } ACE_Time_Value tv (120, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); ACE_DEBUG ((LM_DEBUG, "(%P) Threads finished\n")); CORBA::Long count = - payload_receiver->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER); + payload_receiver->get_message_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P) - Payload_Receiver got %d messages\n", count)); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 55ccd63e20e..065d1ae1e2f 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); Test::Payload_Receiver_var payload_receiver = - payload_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (payload_receiver.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -85,19 +85,19 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (240, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 60a43593f69..6b6b332a9cc 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -30,7 +30,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, CORBA::ULong thread_count, CORBA::ULong message_count, Test::Session_List &session_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { session_list.length (this->peer_count_); CORBA::ULong count = 0; @@ -44,13 +44,13 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, thread_count, message_count, this->peer_count_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) +Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL) { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; @@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -72,7 +72,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL) void Coordinator::add_peer (Test::Peer_ptr peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 48f5180eb78..0c8211c09b2 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -36,14 +36,14 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, Test::Session_List &session_list - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Shutdown all the peers - void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index c4bd8a20639..3ffb1bf388f 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -21,7 +21,7 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl; @@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control, ACE_CHECK_RETURN (Test::Session::_nil ()); PortableServer::ServantBase_var transfer_ownership (session_impl); - return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -47,5 +47,5 @@ Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index 41ab681be6f..8069d439665 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -33,9 +33,9 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index efe3afe001f..2ec327b5946 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -36,7 +36,7 @@ Session::svc (void) /// thread PortableServer::ServantBase_var auto_decrement (this); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -63,7 +63,7 @@ Session::svc (void) { Test::Payload_var received = this->other_sessions_[j]->echo_payload (payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -76,7 +76,7 @@ Session::svc (void) return 0; } } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -91,7 +91,7 @@ Session::svc (void) void Session::start (const Test::Session_List &other_sessions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)) @@ -112,12 +112,12 @@ Session::start (const Test::Session_List &other_sessions // access to this object.... ACE_TRY { - this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->task_.activate ( THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) { - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -144,12 +144,12 @@ 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 TAO_ENV_ARG_PARAMETER); + this->terminate (0 ACE_ENV_ARG_PARAMETER); } Test::Payload * Session::echo_payload (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) @@ -188,7 +188,7 @@ Session::echo_payload (const Test::Payload &the_payload if (this->more_work ()) return retval._retn (); } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); @@ -196,18 +196,18 @@ Session::echo_payload (const Test::Payload &the_payload void -Session::destroy (TAO_ENV_SINGLE_ARG_DECL) +Session::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -224,14 +224,14 @@ Session::more_work (void) const void Session::terminate (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { // Make sure that global resources are released ACE_TRY_EX(GLOBAL) { this->control_->session_finished (success - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(GLOBAL); } ACE_CATCHANY diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index 112165a85b2..bcee5c959d0 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -37,23 +37,23 @@ public: // = The skeleton methods virtual void start (const Test::Session_List &other_sessions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)); virtual Test::Payload* echo_payload (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: /// Helper function used to report any problems and destroy local /// resources void terminate (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 62a77e985b3..5b5c2e8ee44 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -42,7 +42,7 @@ Session_Control::~Session_Control (void) void Session_Control::session_finished (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success if (session_count_ == 0) { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h index 3f3dfcab3f9..a574ec4134f 100644 --- a/TAO/tests/Big_Twoways/Session_Control.h +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -35,7 +35,7 @@ public: // = The skeleton methods virtual void session_finished (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 1b90a459f6f..ed04da64896 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -57,18 +57,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Coordinator_var coordinator = - Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -86,24 +86,24 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var peer_owner_transfer(peer_impl); Test::Peer_var peer = - peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER); + coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 6b164fb63f9..75797785317 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -64,15 +64,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -81,7 +81,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -94,11 +94,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl); Test::Coordinator_var coordinator = - coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -111,7 +111,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); @@ -120,7 +120,7 @@ main (int argc, char *argv[]) ++i) { ACE_Time_Value tv (1, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "done.\n")); @@ -139,7 +139,7 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl); Test::Session_Control_var session_control = - session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test::Session_List session_list; @@ -148,7 +148,7 @@ main (int argc, char *argv[]) thread_count, message_count, session_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (session_list.length () == peer_count); @@ -169,7 +169,7 @@ main (int argc, char *argv[]) } session_list[j]->start (other_sessions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -180,7 +180,7 @@ main (int argc, char *argv[]) ++k) { ACE_Time_Value tv (1, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -195,18 +195,18 @@ main (int argc, char *argv[]) for (j = 0; j != peer_count; ++j) { - session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index 80af10cfde4..744dd414e47 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -13,7 +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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value sleep_time (0, sleep_microseconds); @@ -21,8 +21,8 @@ Blocking_Sync_None::slow_operation (const Test::Payload &, } void -Blocking_Sync_None::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Blocking_Sync_None::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 8e970e76ee4..ae0fc296fec 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -27,10 +27,10 @@ public: // = The skeleton methods virtual void slow_operation (const Test::Payload &the_payload, CORBA::ULong sleep_microseconds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index 6275dd20856..fb8c1c89b02 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -46,18 +46,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Blocking_Sync_None_var blocking_sync_none = - Test::Blocking_Sync_None::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Blocking_Sync_None::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (blocking_sync_none.in ())) @@ -67,11 +67,11 @@ main (int argc, char *argv[]) 1); CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (policy_current.in ())) @@ -86,14 +86,14 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const int payload_length = 65536; @@ -111,7 +111,7 @@ main (int argc, char *argv[]) blocking_sync_none->slow_operation (payload, sleep_microseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value elapsed = ACE_OS::gettimeofday (); @@ -123,10 +123,10 @@ main (int argc, char *argv[]) } } - blocking_sync_none->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + blocking_sync_none->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (blocked_calls > iterations / 20) diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index 59278406f4f..8ab148a2db0 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl); Test::Blocking_Sync_None_var blocking_sync_none = - blocking_sync_none_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + blocking_sync_none_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (blocking_sync_none.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (blocking_sync_none.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index 7b6407c01d9..dbcf70eabbb 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -213,7 +213,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:l:"); diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index c82887f6eae..87d8dec4eb4 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -33,7 +33,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; static const CORBA::TypeCode_ptr tcs[]= @@ -104,7 +104,7 @@ main (int argc, char *argv[]) { CORBA::TypeCode_ptr tc = *i; - CORBA::TCKind k = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; switch (k) @@ -116,10 +116,10 @@ main (int argc, char *argv[]) case CORBA::tk_alias: case CORBA::tk_except: { - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = 0; diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index c1cb89ae728..8d28b7d9bc5 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -14,7 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) @@ -27,8 +27,8 @@ Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index 2222cb5236d..501584bd17d 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/Hello.h @@ -25,10 +25,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL) + virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index 896af123dd7..167a3e08b27 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/client.cpp @@ -45,18 +45,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) @@ -68,7 +68,7 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER); + hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", @@ -76,11 +76,11 @@ main (int argc, char *argv[]) if (do_shutdown) { - hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index dab7a38e33a..0a3a75b9185 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index 2e7d2ebc5c8..2ae166c58be 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -30,12 +30,12 @@ Client_Task::svc (void) ACE_TRY { - this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != this->iterations_; ++i) { - int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) @@ -65,13 +65,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { for (int i = 0; i != 100; ++i) { - (void) this->process_factory_->noop (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) this->process_factory_->noop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -84,18 +84,18 @@ Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) } int -Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL) +Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { Test::Process_var process = - this->process_factory_->create_new_process (TAO_ENV_SINGLE_ARG_PARAMETER); + this->process_factory_->create_new_process (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - (void) process->get_process_id (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) process->get_process_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - process->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + process->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 1; diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h index bf1cdcbe900..83b5fd50637 100644 --- a/TAO/tests/Client_Leaks/Client_Task.h +++ b/TAO/tests/Client_Leaks/Client_Task.h @@ -29,10 +29,10 @@ public: private: /// Run one iteration of the test - int one_iteration (TAO_ENV_SINGLE_ARG_DECL); + int one_iteration (ACE_ENV_SINGLE_ARG_DECL); /// Make sure that the thread has a connection available - void validate_connection (TAO_ENV_SINGLE_ARG_DECL); + void validate_connection (ACE_ENV_SINGLE_ARG_DECL); private: /// Reference to the test interface diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index f7135b2fab6..02e80c8e7aa 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -11,16 +11,16 @@ Process::Process (CORBA::ORB_ptr orb) } CORBA::Long -Process::get_process_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Process::get_process_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return ACE_OS::getpid (); } void -Process::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Process::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index e2c74fcf62a..cb69ff8a24f 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -25,10 +25,10 @@ public: Process (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long get_process_id (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_process_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index 48bfb96e6d7..f1039150d26 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -20,7 +20,7 @@ Process_Factory::shutdown_received (void) } Test::Process_ptr -Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL) +Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)) { Startup_Callback *startup_callback_impl; @@ -32,11 +32,11 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var owner_transfer(startup_callback_impl); Test::Startup_Callback_var startup_callback = - startup_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + startup_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Test::Process::_nil ()); CORBA::String_var ior = - this->orb_->object_to_string (startup_callback.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Test::Process::_nil ()); const char* argv[3] = { @@ -68,7 +68,7 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0; i != 500 && !process_has_started; ++i) { ACE_Time_Value interval (0, 10000); - this->orb_->perform_work (interval TAO_ENV_ARG_PARAMETER); + this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Test::Process::_nil ()); process_has_started = @@ -78,12 +78,12 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { PortableServer::POA_var poa = - startup_callback_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + startup_callback_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (startup_callback_impl TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -104,15 +104,15 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL) } void -Process_Factory::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Process_Factory::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Process_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Process_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown_received_ = 1; - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index dffc1f930b0..057e0a2557f 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -28,13 +28,13 @@ public: int shutdown_received (void); // = The skeleton methods - virtual Test::Process_ptr create_new_process (TAO_ENV_SINGLE_ARG_DECL) + virtual Test::Process_ptr create_new_process (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)); - virtual void noop (TAO_ENV_SINGLE_ARG_DECL) + virtual void noop (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp index 21935bbec89..150de719f94 100644 --- a/TAO/tests/Client_Leaks/Server_Task.cpp +++ b/TAO/tests/Client_Leaks/Server_Task.cpp @@ -22,7 +22,7 @@ Server_Task::svc (void) { // run the test for at most 120 seconds... // ACE_Time_Value tv (120, 0); - this->orb_->run ( /* tv, */ TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run ( /* tv, */ ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp index 6c55a96b5a0..df4d755a97f 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.cpp +++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp @@ -23,7 +23,7 @@ Startup_Callback::process_has_started (Test::Process_out the_process) void Startup_Callback::started (Test::Process_ptr process - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 e5b6c619ef4..2271320207e 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.h +++ b/TAO/tests/Client_Leaks/Startup_Callback.h @@ -33,7 +33,7 @@ public: // = The skeleton methods virtual void started (Test::Process_ptr the_process - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index b2d66aae41a..4ee5c104d0b 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -11,14 +11,14 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc < 2) { // Paranoia, we should have an auto_ptr-like gadget for // this. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, @@ -27,10 +27,10 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Startup_Callback_var startup_callback = - Test::Startup_Callback::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (startup_callback.in ())) { @@ -40,11 +40,11 @@ main (int argc, char *argv[]) } CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -53,7 +53,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Process *process_impl; @@ -63,23 +63,23 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(process_impl); Test::Process_var process = - process_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + process_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - startup_callback->started (process.in () TAO_ENV_ARG_PARAMETER); + startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (50, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp index 3dac3dff84a..a06c49b3e8a 100644 --- a/TAO/tests/Client_Leaks/client.cpp +++ b/TAO/tests/Client_Leaks/client.cpp @@ -51,18 +51,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Process_Factory_var process_factory = - Test::Process_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Process_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (process_factory.in ())) @@ -83,10 +83,10 @@ main (int argc, char *argv[]) } ACE_Thread_Manager::instance ()->wait (); - process_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + process_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only pass the test if 90% of the calls worked diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 9f1492674bc..4260fbfd963 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(process_factory_impl); Test::Process_Factory_var process = - process_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + process_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,7 +86,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Task server_task (orb.in (), @@ -101,10 +101,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index 29062b2a642..a552eb3bef3 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -39,21 +39,21 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "my_orb" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "my_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain a reference to the CodecFactory. CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IOP::CodecFactory_var codec_factory = - IOP::CodecFactory::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ---------------------------------------------------------- @@ -67,7 +67,7 @@ main (int argc, char *argv[]) // Obtain the CDR encapsulation Codec. IOP::Codec_var codec = - codec_factory->create_codec (encoding TAO_ENV_ARG_PARAMETER); + codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ---------------------------------------------------------- @@ -101,11 +101,11 @@ main (int argc, char *argv[]) // Start out with the encode() method, i.e. the one that // includes the TypeCode in the CDR encapsulation. - encoded_data = codec->encode (data TAO_ENV_ARG_PARAMETER); + encoded_data = codec->encode (data ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Extract the data from the octet sequence. - decoded_data = codec->decode (encoded_data.in () TAO_ENV_ARG_PARAMETER); + decoded_data = codec->decode (encoded_data.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; decoded_data.in() >>= extracted_value; @@ -127,13 +127,13 @@ main (int argc, char *argv[]) // 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 TAO_ENV_ARG_PARAMETER); + encoded_data = codec->encode_value (data ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Extract the data from the octet sequence. decoded_data = codec->decode_value (encoded_data.in (), Foo::_tc_Bar - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; decoded_data.in() >>= extracted_value; diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp index d0e720b64a0..ee89da71243 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/Collocation.cpp @@ -13,13 +13,13 @@ int main (int argc, char *argv[]) { Collocation_Test coll_test; - coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER); + coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER); + coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - coll_test.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + coll_test.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index c179cc0c9dd..87fba9ceb92 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -21,19 +21,19 @@ Collocation_Test::Collocation_Test (void) } void -Collocation_Test::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Test::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int -Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL) +Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int result = this->parse_args (argc, argv); @@ -42,52 +42,52 @@ Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL) // Get an Object reference to RootPOA. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow the Object reference to a POA reference this->root_poa_ = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the POAManager of RootPOA this->poa_manager_ = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the diamond servant and its base classes under RootPOA. PortableServer::ObjectId_var id = this->root_poa_->activate_object (&this->top_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // // We only care about the most derived class here. -// this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); +// this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->diamond_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We only care about the most derived class here. this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->left_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->right_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var str = this->orb_->object_to_string (this->diamond_obj_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", @@ -106,37 +106,37 @@ Collocation_Test::parse_args (int /*argc*/, } int -Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL) { Diamond::Top_var top = - Diamond::Top::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); + Diamond::Top::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Left_var left = - Diamond::Left::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); + Diamond::Left::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Right_var right = - Diamond::Right::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); + Diamond::Right::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Buttom_var buttom = - Diamond::Buttom::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); + Diamond::Buttom::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); - str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ())); - str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ())); - str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ())); @@ -144,12 +144,12 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) } int -Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h index ee51d2fa1f0..131e18003dd 100644 --- a/TAO/tests/Collocation/Collocation_Tester.h +++ b/TAO/tests/Collocation/Collocation_Tester.h @@ -29,19 +29,19 @@ class Collocation_Test public: Collocation_Test (void); - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); - int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED); // Initializing the Collocation_Test object. int parse_args (int argc, char *argv[]); // Parse the test specific arguments. - int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // This test narrow an object reference to its base class and see // if it works correctly. - int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Run the test. private: diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp index 149c2aed27b..f94a35d2c4b 100644 --- a/TAO/tests/Collocation/Diamond_i.cpp +++ b/TAO/tests/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h index 4d3ba4293b5..1400bbb5696 100644 --- a/TAO/tests/Collocation/Diamond_i.h +++ b/TAO/tests/Collocation/Diamond_i.h @@ -17,7 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -29,11 +29,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -45,15 +45,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -65,19 +65,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index 0af2e31ef87..ddd39137669 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -38,7 +38,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -58,11 +58,11 @@ main (int argc, char *argv[]) { iorfile = "file://" + iorfile; CORBA::Object_var tmp = - orb->string_to_object(iorfile.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = - test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -73,14 +73,14 @@ main (int argc, char *argv[]) 1); } - test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER); + test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK // 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" TAO_ENV_ARG_PARAMETER); + test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK holder = test; @@ -91,7 +91,7 @@ main (int argc, char *argv[]) // removed. if (!CORBA::is_nil(holder.in ())) { - holder->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER); + holder->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK } } @@ -102,10 +102,10 @@ main (int argc, char *argv[]) } } - orb->shutdown (1 TAO_ENV_ARG_PARAMETER); + orb->shutdown (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index dce725de720..0a9c8394ebf 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -38,15 +38,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -55,7 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); test_var test = - test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -85,19 +85,19 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); delete test_impl; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp index 9f69f9e1ec0..48b6bc7ccb1 100644 --- a/TAO/tests/Connection_Purging/test_i.cpp +++ b/TAO/tests/Connection_Purging/test_i.cpp @@ -5,7 +5,7 @@ void test_i::send_stuff (const char* string - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 b862bd1e806..d73acbf3587 100644 --- a/TAO/tests/Connection_Purging/test_i.h +++ b/TAO/tests/Connection_Purging/test_i.h @@ -23,7 +23,7 @@ class test_i public: // = The skeleton methods virtual void send_stuff (const char* string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp index db977d4d71c..59b0bcb3398 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -10,7 +10,7 @@ Oneway_Receiver::Oneway_Receiver (void) } void -Oneway_Receiver::receive_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Receiver::receive_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index 69eeebf4920..85b76acc476 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -25,7 +25,7 @@ public: Oneway_Receiver (void); // = The skeleton methods - virtual void receive_oneway (TAO_ENV_SINGLE_ARG_DECL) + virtual void receive_oneway (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index 0ea17c4a904..f43bed72e14 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -41,11 +41,11 @@ parse_args (int argc, char *argv[]) int single_iteration (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - oneway_receiver->receive_oneway (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->receive_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 40000); ACE_OS::sleep (tv); @@ -64,18 +64,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Oneway_Receiver_var oneway_receiver = - Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (oneway_receiver.in ())) @@ -91,7 +91,7 @@ main (int argc, char *argv[]) for (int i = 0; i != iterations; ++i) { int result = single_iteration (oneway_receiver.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) exception_count++; @@ -108,7 +108,7 @@ main (int argc, char *argv[]) if (normal_count == 0) ACE_ERROR ((LM_ERROR, "ERROR: no request was succesful\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index da03693e775..0851a528aee 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -57,7 +57,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -70,11 +70,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -87,7 +87,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a separate thread to crash the server. @@ -99,16 +99,16 @@ main (int argc, char *argv[]) return 1; } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /*NOTREACHED*/ ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index 1c716d5ac16..c90594a4f2f 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -10,14 +10,14 @@ Crashed_Callback::Crashed_Callback (void) } CORBA::Boolean -Crashed_Callback::are_you_there (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::are_you_there (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Crashed_Callback::crash_now_please (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -33,7 +33,7 @@ Crashed_Callback::crash_now_please (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Crashed_Callback::test_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Crashed_Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index cc1b316356b..9352c92bd6a 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -25,13 +25,13 @@ public: Crashed_Callback (void); // = The skeleton methods - virtual CORBA::Boolean are_you_there (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Boolean are_you_there (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void crash_now_please (TAO_ENV_SINGLE_ARG_DECL) + virtual void crash_now_please (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void test_oneway (TAO_ENV_SINGLE_ARG_DECL) + virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index 69f2817c3ff..d4786b4fb6c 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -22,28 +22,28 @@ Service::dump_results (void) void Service::run_test (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int pre_crash_exceptions = - this->call_are_you_there (callback TAO_ENV_ARG_PARAMETER); + this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER); ACE_CHECK; pre_crash_exceptions += - this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER); + this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_TRY { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling crash_now_please\n")); - callback->crash_now_please (TAO_ENV_SINGLE_ARG_PARAMETER); + callback->crash_now_please (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; int pos_crash_exceptions = - this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER); + this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (pre_crash_exceptions != 0) @@ -70,7 +70,7 @@ Service::run_test (Test::Crashed_Callback_ptr callback int Service::call_are_you_there (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n")); @@ -81,7 +81,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback { ACE_TRY { - (void) callback->are_you_there (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) callback->are_you_there (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -95,7 +95,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback int Service::call_test_oneway (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n")); @@ -106,7 +106,7 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback { ACE_TRY { - (void) callback->test_oneway (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 8427d6d80fe..373b00c7757 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -32,7 +32,7 @@ public: // = The skeleton methods virtual void run_test (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -41,7 +41,7 @@ private: * @return Number of exceptions raised */ int call_are_you_there (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()); /// Call the test_oneway method mutiple times. @@ -49,7 +49,7 @@ private: * @return Number of exceptions raised */ int call_test_oneway (Test::Crashed_Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()); private: diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 1c07493fbcc..546493dd016 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -57,18 +57,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) @@ -81,15 +81,15 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -97,11 +97,11 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Service_var service = - Test::Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (service.in ())) @@ -119,22 +119,22 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(crashed_callback_impl); Test::Crashed_Callback_var crashed_callback = - crashed_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + crashed_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - service->run_test (crashed_callback.in () TAO_ENV_ARG_PARAMETER); + service->run_test (crashed_callback.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 09cfd2db824..b2a766e9600 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -57,18 +57,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Make all oneways "reliable." { CORBA::Object_var manager_object = orb->resolve_initial_references("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(manager_object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (policy_manager.in ())) @@ -81,15 +81,15 @@ main (int argc, char *argv[]) policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, policy_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -103,11 +103,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(service_impl); Test::Service_var service = - service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (service.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -120,21 +120,21 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (50, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); service_impl->dump_results (); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index 5496c07f1fa..02dba7c117c 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -63,7 +63,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) // ----------------------------------------------------------------- // Boilerplate CORBA/TAO client-side ORB initialization code. // ----------------------------------------------------------------- - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Prepend a "dummy" program name argument to the Service @@ -88,7 +88,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) this->orb_ = CORBA::ORB_init (new_argc, new_argv.get_buffer (), "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->orb_.in ())) @@ -98,11 +98,11 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) return 1; CORBA::Object_var obj = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->test_ = - Test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->test_.in ())) @@ -139,13 +139,13 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) int Test_Client_Module::fini (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make sure the ORB is destroyed. if (!CORBA::is_nil (this->orb_.in ())) { - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -184,15 +184,15 @@ Test_Client_Module::fini (void) int Test_Client_Module::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Invoke an operation on the Test object. - this->test_->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Shutdown the remote ORB. - this->test_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index aae697c0b63..f3d0d850cff 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -64,7 +64,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) // ----------------------------------------------------------------- // Boilerplate CORBA/TAO server-side ORB initialization code. // ----------------------------------------------------------------- - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Add one to the new argc since "dummy" is being added to the @@ -89,14 +89,14 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) this->orb_ = CORBA::ORB_init (new_argc, new_argv.get_buffer (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->orb_.in ())) return -1; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -105,23 +105,23 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) 1); this->poa_ = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->poa_manager_ = this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_ = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (new_argc, new_argv.get_buffer ()) != 0) return -1; - CORBA::Object_var obj = this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -166,13 +166,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) int Test_Server_Module::fini (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make sure the ORB is destroyed. if (!CORBA::is_nil (this->orb_.in ())) { - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -202,11 +202,11 @@ Test_Server_Module::fini (void) int Test_Server_Module::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Run the ORB event loop in its own thread. - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index f5ee66fd980..aa8d19ec17b 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, @@ -20,14 +20,14 @@ Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAME } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); if (!CORBA::is_nil (this->orb_.in ())) - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } void diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index b0f6ddb293a..9452bce731f 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -34,11 +34,11 @@ public: /// Simple two-way operation used to excercise the ORB transport /// internals. - virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the ORB to be shutdown by the shutdown() method in this diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 047d01fe24f..4919809f944 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -66,7 +66,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -75,11 +75,11 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -95,12 +95,12 @@ main (int argc, char *argv[]) if (test_user_exception == 1) { - server->raise_user_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + server->raise_user_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (test_system_exception == 1) { - server->raise_system_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + server->raise_system_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -117,7 +117,7 @@ main (int argc, char *argv[]) the_in_structure, the_out_structure.out (), name.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -145,7 +145,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index dce3e19f8cc..4aade2c1f03 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -59,11 +59,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -74,14 +74,14 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,7 +90,7 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DSI_Simple_Server server_impl (orb.in (), @@ -98,16 +98,16 @@ main (int argc, char *argv[]) root_poa.in ()); PortableServer::ObjectId_var oid = root_poa->activate_object (&server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server = root_poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -129,7 +129,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index 8d4eabba3da..dfe1919fe78 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -46,11 +46,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -61,11 +61,11 @@ main (int argc, char *argv[]) } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -76,11 +76,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -102,10 +102,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index a278997774d..77c7394dc92 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -12,20 +12,20 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$") void DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::NVList_ptr list; - this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER); + this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - request->arguments (list TAO_ENV_ARG_PARAMETER); + request->arguments (list ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Request_var target_request; @@ -38,7 +38,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request 0, // context_list, target_request.inout (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; target_request->_tao_lazy_evaluation (1); @@ -49,7 +49,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request ACE_TRY { // Updates the byte order state, if necessary. - target_request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UNKNOWN, ex) @@ -72,14 +72,14 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request CORBA::RepositoryId DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, PortableServer::POA_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()) { return CORBA::string_dup ("IDL:Simple_Server:1.0"); } PortableServer::POA_ptr -DSI_Simple_Server::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DSI_Simple_Server::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h index 77333ed445d..50ffe38674f 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.h +++ b/TAO/tests/DSI_Gateway/test_dsi.h @@ -36,18 +36,18 @@ public: // = The DynamicImplementation methods. virtual void invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (()); virtual PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL + 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 6813e9f6af5..767dcca9973 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -14,7 +14,7 @@ Simple_Server_i::test_method (CORBA::Long x, const Structure& the_in_structure, Structure_out the_out_structure, char *&name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Structure *tmp; @@ -39,7 +39,7 @@ Simple_Server_i::test_method (CORBA::Long x, } void -Simple_Server_i::raise_user_exception (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::raise_user_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)) { @@ -49,15 +49,15 @@ Simple_Server_i::raise_user_exception (TAO_ENV_SINGLE_ARG_DECL) } void -Simple_Server_i::raise_system_exception (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::raise_system_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::NO_PERMISSION ()); } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index 6f960b77359..13d0e484c55 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -35,17 +35,17 @@ public: const Structure& the_in_structure, Structure_out the_out_structure, char *&name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void raise_user_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)); - void raise_system_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void raise_system_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 9582037ebd3..82b2fa3e934 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -39,7 +39,7 @@ Data::Data (CORBA::ORB_var orb) m_any1 (CORBA::_tc_long), orb_ (orb) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -63,7 +63,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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -76,27 +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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Generate values for the member variables. this->m_objref1 = root_poa->create_reference ("foo" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->m_objref2 = root_poa->create_reference ("foo" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Clean up after the POA root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 5b44900d2d4..a5da90c10d9 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -74,7 +74,7 @@ Driver::init (int argc, char* argv[]) this->orb_ = CORBA::ORB_init (argc, argv, "local" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index c18f79d4569..1a795c95402 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -55,12 +55,12 @@ Test_DynAny::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -72,13 +72,13 @@ Test_DynAny::run_test (void) CORBA::Any in1 (CORBA::_tc_double); DynamicAny::DynAny_var fa1 = - dynany_factory->create_dyn_any (in1 TAO_ENV_ARG_PARAMETER); + dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_double (data.m_double1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Double d_out = fa1->get_double (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Double d_out = fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (d_out == data.m_double1) @@ -97,14 +97,14 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any in_any1; in_any1 <<= data.m_double1; ftc1->from_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out_any1 >>= d_out; @@ -118,9 +118,9 @@ Test_DynAny::run_test (void) ++this->error_count_; } - fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -133,16 +133,16 @@ Test_DynAny::run_test (void) CORBA_Any in (CORBA::_tc_TypeCode); DynamicAny::DynAny_var fa2 = dynany_factory->create_dyn_any (in - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa2->insert_typecode (data.m_typecode1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var tc_out = fa2->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (tc_out->equal (data.m_typecode1 - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -159,20 +159,20 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var ftc2 = dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any in_any2; in_any2 <<= data.m_typecode1; ftc2->from_any (in_any2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any2 = ftc2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_ptr out_tc; out_any2 >>= out_tc; CORBA::Boolean equal = out_tc->equal (data.m_typecode1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (equal) @@ -187,9 +187,9 @@ Test_DynAny::run_test (void) ACE_TRY_CHECK; - fa2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index ec9fc3c1fbd..0c069d92ae2 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -58,12 +58,12 @@ Test_DynArray::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -77,24 +77,24 @@ Test_DynArray::run_test (void) in_any1 <<= ta; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_long (data.m_long1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Long l_out1 = data.m_long2; fa1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - l_out1 = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER); + l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (l_out1 == data.m_long1) @@ -112,12 +112,12 @@ Test_DynArray::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynArray_var ftc1 = DynamicAny::DynArray::_narrow (ftc1_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) @@ -131,9 +131,9 @@ Test_DynArray::run_test (void) CORBA::Any in_any2; in_any2 <<= ta; ftc1->from_any (in_any2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_array_forany ta_out; out_any1.in () >>= ta_out; @@ -158,9 +158,9 @@ Test_DynArray::run_test (void) as_in[0] = in_any3; as_in[1] = in_any3; ftc1->set_elements (as_in - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_Any out_any2 = as_out[1U]; CORBA::Long l_out2; @@ -176,9 +176,9 @@ Test_DynArray::run_test (void) ++this->error_count_; } - fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index 1b8b4d77894..f910bdfb5e5 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -50,12 +50,12 @@ Test_DynEnum::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -70,16 +70,16 @@ Test_DynEnum::run_test (void) in_any1 <<= te; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynEnum_var de1 = DynamicAny::DynEnum::_narrow (dp1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; de1->set_as_string ("TE_FIRST" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong ul_out1 = de1->get_as_ulong (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ul_out1 == 1) @@ -96,9 +96,9 @@ Test_DynEnum::run_test (void) "testing: set_as_ulong/get_as_string\n")); de1->set_as_ulong (3 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var s = de1->get_as_string (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var s = de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0) @@ -117,12 +117,12 @@ Test_DynEnum::run_test (void) DynamicAny::DynAny_var de2_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynEnum_var de2 = DynamicAny::DynEnum::_narrow (de2_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (de2.in ())) @@ -135,9 +135,9 @@ Test_DynEnum::run_test (void) CORBA_Any in_any2; in_any2 <<= DynAnyTests::TE_THIRD; de2->from_any (in_any2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any_var out_any1 = de2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out_any1.in () >>= te; @@ -151,9 +151,9 @@ Test_DynEnum::run_test (void) ++this->error_count_; } - de1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - de2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 36e8ab2b1ce..8bea56e8f1b 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -60,12 +60,12 @@ Test_DynSequence::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -81,24 +81,24 @@ Test_DynSequence::run_test (void) in_any1 <<= ts; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynSequence_var fa1 = DynamicAny::DynSequence::_narrow (dp1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_string (data.m_string1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; fa1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var out_str1 = fa1->get_string (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var out_str1 = fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!ACE_OS::strcmp (out_str1.in (), data.m_string1)) @@ -138,16 +138,16 @@ Test_DynSequence::run_test (void) elem_any <<= CORBA::Any::from_string (values[i], 8); elements[i] = dynany_factory->create_dyn_any (elem_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } fa1->set_elements_as_dyn_any (elements.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnySeq_var out_elems = - fa1->get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (out_elems->length () != 3) @@ -160,12 +160,12 @@ Test_DynSequence::run_test (void) for (i = 0; i < length; ++i) { - out_str = out_elems[i]->get_string (TAO_ENV_SINGLE_ARG_PARAMETER); + out_str = out_elems[i]->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean equal = out_elems[i]->equal (elements[i].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!equal) @@ -175,7 +175,7 @@ Test_DynSequence::run_test (void) // To show that calling destroy() on a component does // nothing, as required by the spec. - out_elems[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + out_elems[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -191,13 +191,13 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_seq - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; DynamicAny::DynSequence_var ftc1 = DynamicAny::DynSequence::_narrow (ftc1_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) @@ -211,9 +211,9 @@ Test_DynSequence::run_test (void) CORBA_Any in_any2; in_any2 <<= ts; ftc1->from_any (in_any2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_seq *ts_out; out_any1.in () >>= ts_out; @@ -231,7 +231,7 @@ Test_DynSequence::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: length/set_elements/get_elements\n")); - length = ftc1->get_length (TAO_ENV_SINGLE_ARG_PARAMETER); + length = ftc1->get_length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (length != 2) @@ -240,7 +240,7 @@ Test_DynSequence::run_test (void) } ftc1->set_length (3 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::AnySeq as_in (3); as_in.length (3); @@ -251,9 +251,9 @@ Test_DynSequence::run_test (void) in_any3 <<= CORBA::Any::from_string (data.m_string1, 8); as_in[2] = in_any3; ftc1->set_elements (as_in - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong index = 2; CORBA_Any out_any2 = as_out[index]; @@ -271,9 +271,9 @@ Test_DynSequence::run_test (void) "++ OK ++\n")); } - fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index b72b83e6229..52c2abf7ee2 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -58,12 +58,12 @@ Test_DynStruct::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -77,44 +77,44 @@ Test_DynStruct::run_test (void) in_any1 <<= ts; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynStruct_var fa1 = DynamicAny::DynStruct::_narrow (dp1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_char (data.m_char1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_long (data.m_long1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cc->insert_float (data.m_float1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - cc->next (TAO_ENV_SINGLE_ARG_PARAMETER); + cc->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cc->insert_short (data.m_short1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - cc->rewind (TAO_ENV_SINGLE_ARG_PARAMETER); + cc->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // To show that calling destroy() on a component does // nothing, as required by the spec. - cc->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + cc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Char c = fa1->get_char (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (c != data.m_char1) @@ -122,9 +122,9 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Long l = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long l = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (l != data.m_long1) @@ -132,16 +132,16 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cc->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Short s = cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (s != data.m_short1) @@ -160,12 +160,12 @@ Test_DynStruct::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynStruct_var ftc1 = DynamicAny::DynStruct::_narrow (ftc1_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) @@ -182,9 +182,9 @@ Test_DynStruct::run_test (void) CORBA_Any in_any2; in_any2 <<= ts; ftc1->from_any (in_any2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_struct* ts_out; out_any1.in () >>= ts_out; @@ -203,10 +203,10 @@ Test_DynStruct::run_test (void) "testing: current_member_name/current_member_kind\n")); ftc1->seek (2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::FieldName_var fn = - ftc1->current_member_name (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (fn.in (), "es")) @@ -214,7 +214,7 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - CORBA::TCKind tk = ftc1->current_member_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tk = ftc1->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (tk != CORBA::tk_struct) @@ -231,18 +231,18 @@ Test_DynStruct::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: get_members/set_members\n")); - DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var sm_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_struct - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; DynamicAny::DynStruct_var sm = DynamicAny::DynStruct::_narrow (sm_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sm.in ())) @@ -253,9 +253,9 @@ Test_DynStruct::run_test (void) } sm->set_members (nvps.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::NameValuePairSeq_var gm = sm->get_members (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::NameValuePairSeq_var gm = sm->get_members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong index = 2; @@ -264,11 +264,11 @@ Test_DynStruct::run_test (void) ++this->error_count_; } - fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - sm->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sm->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index fb4ce42e20f..c12a5b576e4 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -58,12 +58,12 @@ Test_DynUnion::run_test (void) CORBA::Object_var factory_obj = this->orb_->resolve_initial_references ("DynAnyFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -79,19 +79,19 @@ Test_DynUnion::run_test (void) in_any1 <<= tu; DynamicAny::DynAny_var dp1 = dynany_factory->create_dyn_any (in_any1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynUnion_var fa1 = DynamicAny::DynUnion::_narrow (dp1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fa1->insert_typecode (data.m_typecode1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var s_out1 = fa1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (s_out1.in ()->equal (data.m_typecode1)) @@ -107,16 +107,16 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - CORBA_Any_var out_any1 = fa1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynUnion_var ftc1 = DynamicAny::DynUnion::_narrow (ftc1_base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) @@ -127,12 +127,12 @@ Test_DynUnion::run_test (void) } ftc1->from_any (out_any1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ftc1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var s_out2 = ftc1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (s_out2.in ()->equal (data.m_typecode1)) @@ -148,15 +148,15 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing:discriminator/discriminator_kind\n")); - DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var tc2 = dp2->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc2 = dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind tc1kind = ftc1->discriminator_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tc1kind = ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind tc2kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (tc2kind == tc1kind) @@ -172,13 +172,13 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing:member/member_kind/member_name\n")); - DynamicAny::DynAny_var dp3 = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var dp3 = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var m_nm = ftc1->member_name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var m_nm = ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind tk = ftc1->member_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tk = ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var tc3 = dp3->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!ACE_OS::strcmp (m_nm.in (), "tc") @@ -198,17 +198,17 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: set_to_default_member\n")); - ftc1->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ftc1->seek (1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ftc1->insert_short (data.m_short1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var mem = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var mem = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Short out_s = mem->get_short (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short out_s = mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (out_s == data.m_short1) @@ -221,9 +221,9 @@ Test_DynUnion::run_test (void) ++this->error_count_; } - fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp index 984dcbc34c6..1b017101e10 100644 --- a/TAO/tests/Explicit_Event_Loop/client.cpp +++ b/TAO/tests/Explicit_Event_Loop/client.cpp @@ -29,14 +29,14 @@ int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check arguments. @@ -49,7 +49,7 @@ main (int argc, char *argv[]) // Destringify argv[1]. CORBA::Object_var obj = orb->string_to_object (argv[1] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -61,7 +61,7 @@ main (int argc, char *argv[]) // Narrow. Time_var tm = Time::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tm.in ())) @@ -72,7 +72,7 @@ main (int argc, char *argv[]) } // Get time. - TimeOfDay tod = tm->get_gmt (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeOfDay tod = tm->get_gmt (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 7745b295325..5c25f97887d 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -57,7 +57,7 @@ parse_args (int argc, char *argv[]) TimeOfDay Time_impl:: -get_gmt ( TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +get_gmt ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { time_t time_now = time (0); @@ -83,14 +83,14 @@ void do_something_else() int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -101,31 +101,31 @@ main (int argc, char *argv[]) // Get reference to Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate POA manager. PortableServer::POAManager_var mgr - = poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create an object. Time_impl time_servant; // Write its stringified reference to stdout. - Time_var tm = time_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Time_var tm = time_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb->object_to_string (tm.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -157,12 +157,12 @@ main (int argc, char *argv[]) while (!done) { CORBA::Boolean pending = - orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (pending) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } do_something_else (); diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h index 86d504ec72b..e5c19b27546 100644 --- a/TAO/tests/Explicit_Event_Loop/server.h +++ b/TAO/tests/Explicit_Event_Loop/server.h @@ -26,7 +26,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual TimeOfDay get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 02c51916335..4a707034563 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -21,30 +21,30 @@ Counter_Servant::~Counter_Servant (void) // Counter Interface Methods Implementation. void -Counter_Servant::increment (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::increment (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->count_; } CORBA::Long -Counter_Servant::get_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::get_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->count_; } void -Counter_Servant::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->count_ = 0; } void -Counter_Servant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Counter_Servant::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->policy_tester_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_tester_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index 2ed503217ea..503d9cd3296 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -35,16 +35,16 @@ public: // = Counter Interface Methods Overloading. - virtual void increment (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void increment (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long get_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + + virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index e8beea4ce17..e9b672afcff 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -28,38 +28,38 @@ Policy_Tester::~Policy_Tester (void) } void -Policy_Tester::run (TAO_ENV_SINGLE_ARG_DECL) +Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager_var poa_manager = - this->child_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int Policy_Tester::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ORB Initialization. this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get a reference to the RT-ORB. CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Here we parse the command line paramether passed @@ -74,13 +74,13 @@ Policy_Tester::init (int argc, if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) { this->rt_poa_properties_ = - RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = - RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) @@ -119,7 +119,7 @@ Policy_Tester::init (int argc, } int result = - this->create_objects (TAO_ENV_SINGLE_ARG_PARAMETER); + this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -142,7 +142,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object, int -Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) +Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) { CORBA::PolicyList poa_policy_list; poa_policy_list.length (3); @@ -152,7 +152,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) poa_policy_list[0] = this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create priority Banded Connection Policy. @@ -161,7 +161,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) poa_policy_list[1] = this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Client Protocol Policy. @@ -179,11 +179,11 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) this->rt_orb_->create_client_protocol_policy (protocol_list); CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->poa_ = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_mgr = @@ -193,18 +193,18 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) this->poa_->create_POA ("Child_POA", poa_mgr.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->child_poa_ = - RTPortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create a Corba Object reference, using the policies // set at the POA level. object = this->child_poa_->create_reference ("IDL:Counter:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -214,7 +214,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) "Unable to create Object!\n")) return -1; - Counter_var base_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!check_reference (base_object.in(), @@ -222,7 +222,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) return -1; CORBA::String_var ior = - this->orb_->object_to_string (base_object.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -248,7 +248,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) this->child_poa_->create_reference_with_priority ("IDL:Counter:1.0", this->rt_object_properties_->priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -258,7 +258,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) "Unable to create a Counter Object!\n")) return -1; - Counter_var over_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!check_reference (over_object.in(), @@ -267,7 +267,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) CORBA::String_var o_ior = - this->orb_->object_to_string (over_object.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -286,8 +286,8 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL) } void -Policy_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 86440cb829e..d2a0047ec94 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -35,17 +35,17 @@ public: Policy_Tester (void); ~Policy_Tester (void); - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Runs the test. int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: // Helper method used internally. - int create_objects (TAO_ENV_SINGLE_ARG_DECL); + int create_objects (ACE_ENV_SINGLE_ARG_DECL); CORBA::Boolean check_reference (CORBA::Object_ptr object, const char *msg); diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 8d2329cfa06..ca2c68986ce 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -19,10 +19,10 @@ Policy_Verifier::~Policy_Verifier (void) void Policy_Verifier::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Arg_Shifter arg_shifter (argc, argv); @@ -34,7 +34,7 @@ Policy_Verifier::init (int argc, if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) { this->rt_poa_properties_ = - RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); @@ -42,7 +42,7 @@ Policy_Verifier::init (int argc, else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = - RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); + RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) @@ -89,26 +89,26 @@ Policy_Verifier::init (int argc, // Get the Object references. CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return; - this->base_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (this->base_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) return; - object = this->orb_->string_to_object (this->overridden_object_ref_ TAO_ENV_ARG_PARAMETER); + object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return; - this->overridden_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (this->overridden_object_.in (), @@ -118,30 +118,30 @@ Policy_Verifier::init (int argc, } void -Policy_Verifier::run (TAO_ENV_SINGLE_ARG_DECL ) +Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL ) { this->verify_reference (this->base_object_.in (), this->rt_poa_properties_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->verify_reference (this->overridden_object_.in (), this->rt_object_properties_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Policy_Verifier::verify_reference (Counter_ptr object, RT_Properties *rt_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Policy_var policy_var = object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n")) @@ -150,11 +150,11 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ()); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Priority priority = - priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority_model == RTCORBA::SERVER_DECLARED) @@ -175,14 +175,14 @@ Policy_Verifier::verify_reference (Counter_ptr object, } policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -219,16 +219,16 @@ Policy_Verifier::verify_reference (Counter_ptr object, } } policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); 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 () TAO_ENV_ARG_PARAMETER); + RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocol_list = - client_protocol_policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER); + client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (unsigned int i = 0; i < protocol_list->length (); i++) diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h index d533a32f64a..26afd3e9540 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.h +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h @@ -40,15 +40,15 @@ public: void init (int argc, char *argv[] - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: // -- Helper methods -- void verify_reference (Counter_ptr counter, RT_Properties *rt_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); 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 cff2300b0be..5f49c4bec7a 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -17,7 +17,7 @@ RT_Properties::~RT_Properties (void) RT_Properties * RT_Properties::read_from (const char *file_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { 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 310c8c99174..35166b9d9fa 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.h +++ b/TAO/tests/Exposed_Policies/RT_Properties.h @@ -30,7 +30,7 @@ public: ~RT_Properties (void); static RT_Properties * read_from (const char *file_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // -- Accessor Methods -- void priority (RTCORBA::Priority priority); diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index 4859498b674..05ad6e1d8cb 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -14,16 +14,16 @@ ACE_RCSID(tao, client, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Policy_Verifier policy_verifier; - policy_verifier.init (argc, argv TAO_ENV_ARG_PARAMETER); + policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_verifier.run (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_verifier.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index 2903e49602e..ecc7d20d022 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -21,19 +21,19 @@ ACE_RCSID(tao, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Policy_Tester policy_tester; - int result = policy_tester.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - policy_tester.run (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_tester.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 49072049238..d0c07a5748e 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -40,7 +40,7 @@ public: // Call show on all the window objects void parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: static void x_cb (Fl_Widget *widget, void* cookie); @@ -68,7 +68,7 @@ int main (int argc, char* argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Fl_Window window (300, 100); @@ -81,7 +81,7 @@ int main (int argc, char* argv[]) client.show (); - client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER); + client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Fl::run (); @@ -149,7 +149,7 @@ Client::x_changed (void) ACE_TRY_NEW_ENV { CORBA::Long x = CORBA::Long (this->x_roller_->value ()); - this->server_->set_x_angle (x TAO_ENV_ARG_PARAMETER); + this->server_->set_x_angle (x ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -165,7 +165,7 @@ Client::y_changed (void) ACE_TRY_NEW_ENV { CORBA::Long y = CORBA::Long (this->y_roller_->value ()); - this->server_->set_y_angle (y TAO_ENV_ARG_PARAMETER); + this->server_->set_y_angle (y ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -177,7 +177,7 @@ Client::y_changed (void) void Client::parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *ior = "file://test.ior"; @@ -200,11 +200,11 @@ Client::parse_args (int argc, char *argv[] } CORBA::Object_var object = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->server_ = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } #endif /* ACE_HAS_FL */ diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index bd86b538654..c7ec9047999 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -61,7 +61,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -73,7 +73,7 @@ main (int argc, char *argv[]) sw.show (); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -82,21 +82,21 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_i server_impl (orb.in (), &sw); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -114,7 +114,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (Fl::run () == -1) diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index cac8329a03c..2995785d1c8 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -20,19 +20,19 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, } void -Simple_Server_i::set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) { this->window_->set_x_angle (x); } void -Simple_Server_i::set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED) { this->window_->set_y_angle (y); } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->orb_->shutdown (0); } diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index 2ae0ae47de9..b90dbb78989 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -64,9 +64,9 @@ public: // ctor // = The Simple_Server methods. - void set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED); - void set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED); + void set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index 0c2e85cca46..320a7e98043 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -71,11 +71,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -84,25 +84,25 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -116,14 +116,14 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); Callback_var callback = - callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != niterations; ++i) { CORBA::Long r = server->test_method (0, 0, callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) @@ -138,7 +138,7 @@ main (int argc, char *argv[]) { ACE_TRY_EX(ABORT) { - server->shutdown_now (0 TAO_ENV_ARG_PARAMETER); + server->shutdown_now (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(ABORT); } ACE_CATCH (CORBA::COMM_FAILURE, comm_failure) @@ -153,7 +153,7 @@ main (int argc, char *argv[]) { ACE_TRY_EX(CRASH) { - server->shutdown_now (1 TAO_ENV_ARG_PARAMETER); + server->shutdown_now (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(CRASH); } ACE_CATCH (CORBA::COMM_FAILURE, comm_failure) @@ -167,24 +167,24 @@ main (int argc, char *argv[]) else if (do_suicide) { (void) server->test_method (1, 0, callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n")); } else if (do_self_shutdown) { (void) server->test_method (1, 1, callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (do_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 38d853b4cdb..5ffaeddbd26 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -51,11 +51,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -64,25 +64,25 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -97,11 +97,11 @@ main (int argc, char *argv[]) server.in ()); Simple_Server_var middle = - middle_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + middle_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (middle.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -119,12 +119,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index e3d5480d0a0..21d3b17c5bf 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -39,22 +39,22 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // create child poa with PERSISTENT policy @@ -63,24 +63,24 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); policies[1] = root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -112,15 +112,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index e8129cce447..c3526a74f73 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -10,27 +10,27 @@ ACE_RCSID(Faults, test_i, "$Id$") void PingObject_i::ping (PingObject_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - callback->pong (TAO_ENV_SINGLE_ARG_PARAMETER); + callback->pong (ACE_ENV_SINGLE_ARG_PARAMETER); } void -PingObject_i::pong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +PingObject_i::pong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -PingObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +PingObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -PingObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +PingObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 76ded91dcbf..d9a8dbab725 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -35,14 +35,14 @@ public: // = The PingObject interface methods void ping (PingObject_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void pong (TAO_ENV_SINGLE_ARG_DECL) + void pong (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index 6165d7520c9..1a12c4acb14 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -56,7 +56,7 @@ void run_client (CORBA::ORB_ptr orb, PingObject_ptr server, PingObject_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Run the client requests in a separate routine to isolate the // exceptions... @@ -68,11 +68,11 @@ run_client (CORBA::ORB_ptr orb, ACE_TRY { reason = "Exception during ping call"; - server->ping (callback TAO_ENV_ARG_PARAMETER); + server->ping (callback ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run for <period> milliseconds, to receive the reply - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Terminate the client if: @@ -83,7 +83,7 @@ run_client (CORBA::ORB_ptr orb, { ACE_DEBUG ((LM_DEBUG, "Shutting down server\n")); reason = "Exception during server shutdown"; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -115,22 +115,22 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // create child poa with PERSISTENT policy @@ -139,36 +139,36 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PingObject_var server = - PingObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -183,7 +183,7 @@ main (int argc, char *argv[]) persistent_poa.in ()); PingObject_var callback = - callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -191,13 +191,13 @@ main (int argc, char *argv[]) run_client (orb.in (), server.in (), callback.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index dc8742840fa..847423380a6 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -39,11 +39,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,14 +52,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -76,11 +76,11 @@ main (int argc, char *argv[]) Simple_Server_var server = - server_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -98,12 +98,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index ac290b81b1a..d35a7f275f6 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Failure, test_i, "$Id$") void Callback_i::shutdown (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) @@ -27,7 +27,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean return; } ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -36,14 +36,14 @@ CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n", is_clean)); - callback->shutdown (is_clean TAO_ENV_ARG_PARAMETER); + callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_Time_Value tv (0, 20000); @@ -53,7 +53,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, void Simple_Server_i::shutdown_now (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) @@ -68,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean } ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -84,7 +84,7 @@ CORBA::Long Middle_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int i = 0; @@ -93,14 +93,14 @@ Middle_i::test_method (CORBA::Boolean do_callback, this->server_->test_method (0, 0, callback - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } this->server_->test_method (do_callback, is_clean, callback - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); for (; i != 10; ++i) @@ -108,7 +108,7 @@ Middle_i::test_method (CORBA::Boolean do_callback, this->server_->test_method (0, 0, callback - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -117,19 +117,19 @@ Middle_i::test_method (CORBA::Boolean do_callback, void Middle_i::shutdown_now (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->server_->shutdown_now (is_clean TAO_ENV_ARG_PARAMETER); + this->server_->shutdown_now (is_clean ACE_ENV_ARG_PARAMETER); } void -Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Middle_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,5 +138,5 @@ Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) } ACE_ENDTRY; - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index 87335c1adb3..bad1f05f2af 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -34,7 +34,7 @@ public: // ctor void shutdown (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -59,14 +59,14 @@ public: CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown_now (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -91,14 +91,14 @@ public: CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown_now (CORBA::Boolean is_clean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index aec7d4a2464..7b96483a04a 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa) // Create the Default Descriptor Servant fd_servant_ (poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA - poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER); + poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -35,7 +35,7 @@ FileImpl::System::~System (void) } PortableServer::POA_ptr -FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -43,7 +43,7 @@ FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) File::Descriptor_ptr FileImpl::System::open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -73,12 +73,12 @@ FileImpl::System::open (const char *file_name, CORBA::Object_var obj = this->poa_->create_reference_with_id (oid.in (), "IDL:File/Descriptor:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = - File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); @@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void) } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) { // // One way of getting our id. // // Get a reference to myself - File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = - this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // PortableServer::ObjectId_var oid2 = - this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER); + this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the POA Current object reference CORBA::Object_var obj = orb->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); PortableServer::ObjectId_var oid3 = - poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); ACE_ASSERT (oid1.in () == oid2.in ()); @@ -163,11 +163,11 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) CORBA::Long FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const CORBA::Octet *data = &buffer[0]; @@ -183,11 +183,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer File::Descriptor::DataBuffer * FileImpl::Descriptor::read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes); @@ -206,11 +206,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, CORBA::Long whence - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor, @@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Close the file corresponding to this object reference. diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index 30c6c6f5e5b..ebe06fce403 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/File_i.h @@ -34,35 +34,35 @@ public: ~Descriptor (void); // Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA of this object virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // write buffer to File corresponding to this Descriptor virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // seek to the offset in file from whence - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // closes the file corresponding to the requested ObjectID private: - ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL); + ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL); // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; @@ -80,12 +80,12 @@ public: ~System (void); //Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 11021da4b71..a08a3af6baf 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -75,41 +75,41 @@ parse_args (int argc, char **argv) static void * MTTEST (void *args) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_CString& ior = *(ACE_CString*)args; ACE_TRY { CORBA::Object_var object = orb->string_to_object (ior.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a File::System File::System_var file_system = File::System::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creat the file filename i.e "test" File::Descriptor_var fd = file_system->open (filename, O_RDONLY - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for( int i=0; i<loops; ++i) { //seek to the beginning of the file ACE_DEBUG((LM_DEBUG,"Making request number %d\n",i)); - fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER); + fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Read back the written message // Twice the size of the socket buffer File::Descriptor::DataBuffer_var data_received = fd->read (128*1024 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // close the file - fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -125,12 +125,12 @@ MTTEST (void *args) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 93faa6764d4..a68e753a6e9 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -77,11 +77,11 @@ main (int argc, char *argv[]) ACE_OS::write (handle, "", 1); ACE_OS::close (handle); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -91,16 +91,16 @@ main (int argc, char *argv[]) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA reference PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (5); @@ -108,27 +108,27 @@ main (int argc, char *argv[]) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "firstPOA"; @@ -136,7 +136,7 @@ main (int argc, char *argv[]) root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; @@ -144,7 +144,7 @@ main (int argc, char *argv[]) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -156,16 +156,16 @@ main (int argc, char *argv[]) first_poa->activate_object_with_id (file_system_oid.in (), &file_system_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var file_system = - first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER); + first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the "FileSystem" object CORBA::String_var file_system_ior = - orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", @@ -182,7 +182,7 @@ main (int argc, char *argv[]) // set the state of the poa_manager to active i.e ready to // process requests - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker (orb.in ()); @@ -217,12 +217,12 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Run the ORB for atmost 75 seconds ACE_Time_Value tv (75, 0); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 528c3dfde2c..7d6eee99bb3 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -52,7 +52,7 @@ public: Worker (CORBA::ORB_ptr orb); // Constructor - virtual void run_test (TAO_ENV_SINGLE_ARG_DECL); + virtual void run_test (ACE_ENV_SINGLE_ARG_DECL); // The actual implementation of the test // = The Task_Base methods @@ -69,7 +69,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -85,12 +85,12 @@ main (int argc, char *argv[]) ACE_Time_Value tv (5, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now run a test in the main thread, just to confuse matters a // little more. - worker.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); + worker.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; worker.thr_mgr ()->wait (); @@ -98,18 +98,18 @@ main (int argc, char *argv[]) if (do_shutdown) { CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -135,7 +135,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->run_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -149,16 +149,16 @@ Worker::svc (void) } void -Worker::run_test (TAO_ENV_SINGLE_ARG_DECL) +Worker::run_test (ACE_ENV_SINGLE_ARG_DECL) { for (int j = 0; j != niterations; ++j) { CORBA::Object_var object = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean is_simple_server = - object->_is_a ("IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER); + object->_is_a ("IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!is_simple_server) ACE_DEBUG ((LM_DEBUG, @@ -166,11 +166,11 @@ Worker::run_test (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Object_var object = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (server.in ())) @@ -184,7 +184,7 @@ Worker::run_test (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0; i != niterations; ++i) { CORBA::Boolean r = - server->test_is_a ("IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER); + server->test_is_a ("IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (r != 0) diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index 2b2acda8579..20260593cf9 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -40,15 +40,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,25 +65,25 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - orb->resolve_initial_references("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var table = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (table.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the IORTable.\n"), 1); - table->bind ("Simple_Server", ior.in () TAO_ENV_ARG_PARAMETER); + table->bind ("Simple_Server", ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -97,10 +97,10 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index ede8a267b1b..b110a24573e 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Forwarding, test_i, "$Id$") CORBA::Boolean Simple_Server_i::test_is_a (const char * /* type */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type)); @@ -18,8 +18,8 @@ Simple_Server_i::test_is_a (const char * /* type */ } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h index e8ce284c368..01b273ba987 100644 --- a/TAO/tests/Forwarding/test_i.h +++ b/TAO/tests/Forwarding/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean test_is_a (const char * type TAO_ENV_ARG_DECL_NOT_USED) + CORBA::Boolean test_is_a (const char * type ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index dc959b7650c..70af3ea8a11 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index 2222cb5236d..501584bd17d 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/Hello.h @@ -25,10 +25,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL) + virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp index 3837dd04185..f85722246b5 100644 --- a/TAO/tests/Hello/client.cpp +++ b/TAO/tests/Hello/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) @@ -62,16 +62,16 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER); + hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index a5e2ca1ea95..0b56e777eb6 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -41,15 +41,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -58,7 +58,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -71,11 +71,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> @@ -88,18 +88,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index d46d46e94ef..0d4954c42d8 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -50,17 +50,17 @@ main (int argc , char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test of pragma prefix handling. @@ -71,7 +71,7 @@ main (int argc , char *argv[]) hello_i h; - obj = h._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = h._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -86,7 +86,7 @@ main (int argc , char *argv[]) goodbye_i g; - obj = g._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = g._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -101,7 +101,7 @@ main (int argc , char *argv[]) sayonara_i s; - obj = s._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = s._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -116,7 +116,7 @@ main (int argc , char *argv[]) ciao_i c; - obj = c._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = c._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -131,7 +131,7 @@ main (int argc , char *argv[]) aloha_i a; - obj = a._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = a._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -173,7 +173,7 @@ main (int argc , char *argv[]) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 0e8a36929f6..88b3cbf7307 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -32,14 +32,14 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** @@ -47,12 +47,12 @@ main (int argc, char *argv[]) // Get an object reference for the ORBs IORManipulation object! CORBA::Object_var IORM = orb_->resolve_initial_references ("IORManipulation" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_var iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** @@ -60,22 +60,22 @@ main (int argc, char *argv[]) // Create a few fictitious IORs CORBA::Object_var name1 = orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var name2 = orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** CORBA::String_var name1_ior = - orb_->object_to_string (name1.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (name1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.in ())); CORBA::String_var name2_ior = - orb_->object_to_string (name2.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (name2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ())); @@ -87,21 +87,21 @@ main (int argc, char *argv[]) iors [0] = name1; iors [1] = name2; - CORBA::Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); + CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var merged_ior = - orb_->object_to_string (merged.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (merged.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong count1 = iorm->get_profile_count (iors [0] TAO_ENV_ARG_PARAMETER); + CORBA::ULong count1 = iorm->get_profile_count (iors [0] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong count2 = iorm->get_profile_count (iors [1] TAO_ENV_ARG_PARAMETER); + CORBA::ULong count2 = iorm->get_profile_count (iors [1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong count = iorm->get_profile_count (merged.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count != (count1 + count2)) @@ -117,7 +117,7 @@ main (int argc, char *argv[]) // IORs is NULL. CORBA::ULong in_count = iorm->is_in_ior (merged.in (), name1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count1 != in_count) @@ -128,7 +128,7 @@ main (int argc, char *argv[]) in_count = iorm->is_in_ior (merged.in (), name2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count2 != in_count) @@ -142,14 +142,14 @@ 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 () TAO_ENV_ARG_PARAMETER); + iorm->remove_profiles (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var just1_ior = - orb_->object_to_string (just1.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (just1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - count = iorm->get_profile_count (just1.in () TAO_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (just1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count1 != count) @@ -162,7 +162,7 @@ main (int argc, char *argv[]) count, just1_ior.in ())); - in_count = iorm->is_in_ior (just1.in (), name1.in () TAO_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (just1.in (), name1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count1 != in_count) @@ -175,10 +175,10 @@ main (int argc, char *argv[]) // Now try the add_profiles interface. CORBA::Object_var merged2 = - iorm->add_profiles (just1.in (), name2.in () TAO_ENV_ARG_PARAMETER); + iorm->add_profiles (just1.in (), name2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - count = iorm->get_profile_count (merged2.in () TAO_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (merged2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count != (count1 + count2)) @@ -186,7 +186,7 @@ main (int argc, char *argv[]) "**ERROR: add_profile failed profile count test!\n")); CORBA::String_var merged2_ior = - orb_->object_to_string (merged2.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (merged2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -196,7 +196,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 () TAO_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (merged2.in (), name1. in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count1 != in_count) @@ -205,7 +205,7 @@ main (int argc, char *argv[]) "count bad (%d)!\n", in_count)); - in_count = iorm->is_in_ior (merged2.in (), name2.in () TAO_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (merged2.in (), name2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count2 != in_count) @@ -216,14 +216,14 @@ main (int argc, char *argv[]) // ********************************************************************** CORBA::Object_var just2 = - iorm->remove_profiles (merged2.in (), name1.in () TAO_ENV_ARG_PARAMETER); + iorm->remove_profiles (merged2.in (), name1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var just2_ior = - orb_->object_to_string (just2.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (just2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - count = iorm->get_profile_count (just2.in () TAO_ENV_ARG_PARAMETER); + count = iorm->get_profile_count (just2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count2 != count) @@ -234,7 +234,7 @@ main (int argc, char *argv[]) count, just2_ior.in ())); - in_count = iorm->is_in_ior (just2.in (), name2.in () TAO_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (just2.in (), name2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (count2 != in_count) @@ -247,7 +247,7 @@ 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 () TAO_ENV_ARG_PARAMETER); + in_count = iorm->is_in_ior (just2.in (), name1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp index 11028ad50b5..a3c0b51e25a 100644 --- a/TAO/tests/InterOp-Naming/INS_i.cpp +++ b/TAO/tests/InterOp-Naming/INS_i.cpp @@ -24,7 +24,7 @@ INS_i::orb (CORBA::ORB_ptr o) } char * -INS_i::test_ins (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +INS_i::test_ins (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index 6fb278a0c90..38687ea246c 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -33,8 +33,8 @@ public: ~INS_i (void); // Destructor. - char * test_ins (TAO_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC (( CORBA::SystemException )); + char * test_ins (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC (( CORBA::SystemException )); // test the INS. void orb (CORBA::ORB_ptr o); diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 3e843c3a1c3..8c543b717c5 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -8,14 +8,14 @@ main (int argc, char *argv[]) { int i = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve a reference to the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc < 2) @@ -33,7 +33,7 @@ main (int argc, char *argv[]) { // List initial services CORBA::ORB::ObjectIdList_var list = - orb->list_initial_services (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->list_initial_services (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; size_t length = list->length (); @@ -64,7 +64,7 @@ main (int argc, char *argv[]) } else { - objref = orb->resolve_initial_references (argv[i] TAO_ENV_ARG_PARAMETER); + objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (objref.in ())) @@ -74,7 +74,7 @@ main (int argc, char *argv[]) -1); INS_var server = INS::_narrow (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -83,7 +83,7 @@ main (int argc, char *argv[]) orb->object_to_string (server.in ()))); CORBA::String_var test_ins_result = - server->test_ins (TAO_ENV_SINGLE_ARG_PARAMETER); + server->test_ins (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp index a65bffc9c54..c45f732a26f 100644 --- a/TAO/tests/InterOp-Naming/INS_test_server.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp @@ -17,11 +17,11 @@ main (int argc, char *argv[]) { if (server.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index 6a5a08b94cf..3e0c31ad32b 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -78,14 +78,14 @@ Server_i::add_IOR_to_table (CORBA::String_var ior) CORBA::Object_var table_object = this->orb_manager_.orb ()->resolve_initial_references ( "IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, ex) @@ -101,14 +101,14 @@ Server_i::add_IOR_to_table (CORBA::String_var ior) int Server_i::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // 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" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -134,7 +134,7 @@ Server_i::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("INS_servant", &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -167,10 +167,10 @@ Server_i::init (int argc, } int -Server_i::run (TAO_ENV_SINGLE_ARG_DECL) +Server_i::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1); diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index d15824c425b..76309d6a212 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -38,13 +38,13 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. int add_IOR_to_table (CORBA::String_var ior); // Add an IOR to the ORB-IOR table. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. protected: diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 45efec07038..64a61e7b5ff 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -109,7 +109,7 @@ public: int svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -135,7 +135,7 @@ public: work_from_this_thread)); CORBA::ULong result = this->test_->method (work_from_this_thread - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (work_from_this_thread != result) @@ -185,7 +185,7 @@ public: int svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -205,7 +205,7 @@ public: ACE_Time_Value timeout (0, event_loop_timeout_for_this_thread * 1000); - this->orb_->run (timeout TAO_ENV_ARG_PARAMETER); + this->orb_->run (timeout ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n")); @@ -237,7 +237,7 @@ private: int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -246,7 +246,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -256,12 +256,12 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = - orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); + orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. test_var server = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_task (server.in ()); @@ -292,7 +292,7 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 6876d4a0b27..42575677363 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -54,11 +54,11 @@ public: int svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -88,24 +88,24 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -114,12 +114,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -147,7 +147,7 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index 342ea2ea087..e114456a10f 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -10,16 +10,16 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong test_i::method (CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 6395ac7eb07..b884d8b517f 100644 --- a/TAO/tests/Leader_Followers/test_i.h +++ b/TAO/tests/Leader_Followers/test_i.h @@ -26,10 +26,10 @@ public: // = The test interface methods. CORBA::ULong method (CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 712ed680558..6ca6f72ef38 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -15,7 +15,7 @@ void AMI_Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; @@ -31,10 +31,10 @@ AMI_Manager::start_workers (CORBA::Short worker_count, } void -AMI_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL) +AMI_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -54,7 +54,7 @@ int Worker::svc (void) { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_SYNCH_MUTEX mutex; @@ -69,11 +69,11 @@ Worker::svc (void) -1); PortableServer::ServantBase_var auto_destroy (handler_impl); - handler = handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } this->controller_->sendc_worker_started (handler.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); @@ -82,7 +82,7 @@ Worker::svc (void) ACE_OS::sleep (tv); this->controller_->sendc_worker_finished (handler.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); @@ -90,7 +90,7 @@ Worker::svc (void) for (;;) { ACE_Time_Value tv (0, 1000 * this->milliseconds_); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); @@ -117,7 +117,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, } void -Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -127,12 +127,12 @@ Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Controller_Handler::worker_started_excep (Test::AMI_ControllerExceptionHolder* h - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - h->raise_worker_started (TAO_ENV_SINGLE_ARG_PARAMETER); + h->raise_worker_started (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,7 +145,7 @@ Controller_Handler::worker_started_excep } void -Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -155,12 +155,12 @@ Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Controller_Handler::worker_finished_excep (Test::AMI_ControllerExceptionHolder *h - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - h->raise_worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER); + h->raise_worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 84ca8247dd5..a351e61d38d 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -25,9 +25,9 @@ public: virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -70,15 +70,15 @@ public: int *pending_replies); // Constructor - virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL) + virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder* - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL) + virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder* - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index 2485ce0489f..94008f0a364 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -24,7 +24,7 @@ Controller::dump_results () } void -Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -34,7 +34,7 @@ Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Controller::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index 1ab48e7c104..47587760e7f 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -24,9 +24,9 @@ public: // Print out the results and any errors // = The skeleton methods - virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL) + virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL) + virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index b9b9a2d1685..6151d64e7c6 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -15,7 +15,7 @@ void Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; @@ -30,10 +30,10 @@ Manager::start_workers (CORBA::Short worker_count, } void -Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } @@ -52,10 +52,10 @@ int Worker::svc (void) { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->controller_->worker_started (TAO_ENV_SINGLE_ARG_PARAMETER); + this->controller_->worker_started (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); @@ -63,7 +63,7 @@ Worker::svc (void) ACE_Time_Value tv (0, 1000 * this->milliseconds_); ACE_OS::sleep (tv); - this->controller_->worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER); + this->controller_->worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 31cf037ced8..9a73fac67ba 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -27,9 +27,9 @@ public: virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp index a4ed57650f7..4223798dc86 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.cpp +++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp @@ -14,7 +14,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager, } void -Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL) +Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -22,7 +22,7 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL) this->manager_->start_workers (CORBA::Short(10), CORBA::Long(1000), this->controller_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -35,12 +35,12 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL) void Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_start_workers (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_start_workers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index bc489e678b1..7ead1579196 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -25,10 +25,10 @@ public: // Constructor // = The skeleton methods - virtual void start_workers (TAO_ENV_SINGLE_ARG_DECL) + virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder* - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 997c8871d2f..e22153a203d 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -39,11 +39,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -52,11 +52,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,14 +65,14 @@ main (int argc, char *argv[]) Controller controller_impl; Test::Controller_var controller = - controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Manager_var manager = - Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (manager.in ())) @@ -83,10 +83,10 @@ main (int argc, char *argv[]) Manager_Handler handler_impl (manager.in (), controller.in ()); Test::AMI_ManagerHandler_var handler = - handler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + handler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const CORBA::Short worker_count = 10; @@ -94,22 +94,22 @@ main (int argc, char *argv[]) worker_count, CORBA::Long (1000), controller.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (30, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; controller_impl.dump_results (); - manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 188afbd32d1..ed7307129f9 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) AMI_Manager manager_impl (orb.in ()); Test::Manager_var manager = - manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -81,18 +81,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index b1e6cfa917a..b914c957950 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,14 +64,14 @@ main (int argc, char *argv[]) Controller controller_impl; Test::Controller_var controller = - controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Manager_var manager = - Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (manager.in ())) @@ -80,25 +80,25 @@ main (int argc, char *argv[]) 1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const CORBA::Short worker_count = 10; manager->start_workers (worker_count, CORBA::Long (1000), controller.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; controller_impl.dump_results (); - manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index 1c43c2468cc..eb5c55c3bf0 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) Manager manager_impl (orb.in ()); Test::Manager_var manager = - manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -81,18 +81,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index 0358a8aac7c..964d9dc23df 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -49,17 +49,17 @@ parse_args (int argc, char *argv[]) void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -67,23 +67,23 @@ main (int argc, char *argv[]) // Primary server CORBA::Object_var object_primary = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Secondary server CORBA::Object_var object_secondary = - orb->string_to_object (name TAO_ENV_ARG_PARAMETER); + orb->string_to_object (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get an object reference for the ORBs IORManipultion object! CORBA_Object_ptr IORM = orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); @@ -91,12 +91,12 @@ main (int argc, char *argv[]) iors [0] = object_primary; iors [1] = object_secondary; - CORBA_Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); + CORBA_Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (merged.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -107,7 +107,7 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () TAO_ENV_ARG_PARAMETER); + run_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -120,7 +120,7 @@ main (int argc, char *argv[]) } void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int loop = 0; loop < 10; loop++) { @@ -129,7 +129,7 @@ void run_test (Simple_Server_ptr server // Make a remote call cout << "Remote call "<<endl; CORBA::Long ret= - server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER); + server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cout << "The retval is .. " << ret << endl; diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index ac965b990ac..c2481225b94 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,15 +51,15 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -91,12 +91,12 @@ main (int argc, char *argv[]) } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index bbf7e7c0709..8135b51217d 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void) } CORBA::Long -Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -28,7 +28,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index f839fd3c6b4..f6d4df6ebee 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Long remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index 1f394084e40..5019c94d019 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -49,7 +49,7 @@ int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -58,19 +58,19 @@ main (int argc, // Initilaize the ORB, POA etc. manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) return -1; - manager.activate_servant (TAO_ENV_SINGLE_ARG_PARAMETER); + manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - manager.make_iors_register (TAO_ENV_SINGLE_ARG_PARAMETER); + manager.make_iors_register (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - manager.run (TAO_ENV_SINGLE_ARG_PARAMETER); + manager.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -94,30 +94,30 @@ Manager::Manager (void) int Manager::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Obtain the RootPOA. CORBA::Object_var obj_var = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = - PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = - root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Policies for the childPOA to be created. @@ -128,25 +128,25 @@ Manager::init (int argc, // Id Assignment Policy policies[0] = root_poa_var->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Lifespan policy policies[1] = root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Tell the POA to use a servant manager policies[2] = root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Servant Retention Policy -> Use a locator policies[3] = root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_CString name = "newPOA"; @@ -155,7 +155,7 @@ Manager::init (int argc, root_poa_var->create_POA (name.c_str (), poa_manager_var.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Creation of childPOAs is over. Destroy the Policy objects. @@ -164,7 +164,7 @@ Manager::init (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -173,7 +173,7 @@ Manager::init (int argc, int -Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL) +Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->servant_locator_, @@ -186,7 +186,7 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL) // Set ServantLocator object as the servant Manager of // secondPOA. this->new_poa_var_->set_servant_manager (this->servant_locator_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Try to create a reference with user created ID in new_poa @@ -197,7 +197,7 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL) this->new_manager_ior_ = new_poa_var_->create_reference_with_id (second_foo_oid_var.in (), - "IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER); + "IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -205,18 +205,18 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL) int -Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL) +Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) { // First server CORBA::Object_var object_primary = this->orb_->string_to_object (first_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //Second server CORBA::Object_var object_secondary = this->orb_->string_to_object (second_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (third_ior == 0) @@ -225,18 +225,18 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL) // Third Server CORBA::Object_var object_tertiary = this->orb_->string_to_object (third_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get an object reference for the ORBs IORManipultion object! CORBA_Object_ptr IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -249,7 +249,7 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL) // Create a merged set 1; CORBA_Object_var merged_set1 = - iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); + iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (object_secondary.in () == 0) @@ -268,7 +268,7 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL) // Create merged set 2 CORBA_Object_var merged_set2 = - iorm->merge_iors (iors_again TAO_ENV_ARG_PARAMETER); + iorm->merge_iors (iors_again ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var iorref1 = @@ -293,9 +293,9 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL) int -Manager::run (TAO_ENV_SINGLE_ARG_DECL) +Manager::run (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h index 7c61379f133..6f14588b3a3 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.h +++ b/TAO/tests/MProfile_Forwarding/Manager.h @@ -14,19 +14,19 @@ class Manager int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the ORB, POA etc. - int init_register_name_service (TAO_ENV_SINGLE_ARG_DECL); + int init_register_name_service (ACE_ENV_SINGLE_ARG_DECL); // Initialize the Name service, tegister the combined IOR with it - int activate_servant (TAO_ENV_SINGLE_ARG_DECL); + int activate_servant (ACE_ENV_SINGLE_ARG_DECL); // Activate the servant etc. - int make_iors_register (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int make_iors_register (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB event loop.. private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index c3b52c4346b..574990b5072 100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -42,7 +42,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr /* poa_ptr */, const char * /*operation*/, PortableServer::ServantLocator::Cookie & /* cookie */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -59,7 +59,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (this->objref_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -80,7 +80,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &, const char *, PortableServer::ServantLocator::Cookie , PortableServer::Servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index ec8bc40be31..69964b46395 100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h @@ -39,7 +39,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -50,7 +50,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 36b0dd3c49e..e0d3cc53969 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -35,17 +35,17 @@ parse_args (int argc, char *argv[]) void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -63,7 +63,7 @@ main (int argc, char *argv[]) } Simple_Server_var server = - Simple_Server::_narrow (objref.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -73,7 +73,7 @@ main (int argc, char *argv[]) -1); } - run_test (server.in () TAO_ENV_ARG_PARAMETER); + run_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,7 +86,7 @@ main (int argc, char *argv[]) } void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int loop = 0; loop < 10; loop++) { @@ -97,7 +97,7 @@ void run_test (Simple_Server_ptr server ACE_OS::sleep (2); // Make a remote call - server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER); + server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /*ACE_DEBUG ((LM_DEBUG, @@ -106,7 +106,7 @@ void run_test (Simple_Server_ptr server ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */ ACE_DEBUG ((LM_DEBUG, "I am going to shutdown \n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (23); } diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 4672bcd0a74..7d9ace8d48f 100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,15 +51,15 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -91,12 +91,12 @@ main (int argc, char *argv[]) } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index 9866b7fb3a3..2cd5a649db2 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -15,7 +15,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -24,7 +24,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index f55d995e411..8c13fba4b4e 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index 61a155fc737..aaab6575632 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -64,7 +64,7 @@ public: // The thread entry point. private: - void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Validate the connection private: @@ -81,18 +81,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -116,11 +116,11 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,7 +144,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL) +Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -153,7 +153,7 @@ Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; @@ -165,12 +165,12 @@ Client::svc (void) { ACE_TRY_NEW_ENV { - this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 244d1a92ca2..6a6f1db233d 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -81,11 +81,11 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -107,7 +107,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -133,7 +133,7 @@ Client::Client (int niterations, int Client::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (int i = 0; i < this->niterations_; ++i) @@ -144,15 +144,15 @@ 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, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -163,7 +163,7 @@ Client::svc (void) 1); } - server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index 4d344552377..0718edf84e0 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index b10c633832d..61e2bf25496 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -9,14 +9,14 @@ ACE_RCSID(MT_Client, test_i, "$Id$") void -Simple_Server_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 295fe73af56..8e9f0794f76 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index a6c60fb78f9..3948231f376 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -51,18 +51,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -76,7 +76,7 @@ main (int argc, char *argv[]) for (int i = 0; i != niterations; ++i) { CORBA::Long r = - server->test_method (i TAO_ENV_ARG_PARAMETER); + server->test_method (i ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != i) @@ -89,7 +89,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index debba16f9e3..982fc2cbc28 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -66,11 +66,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -79,11 +79,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -92,11 +92,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -114,7 +114,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker (orb.in ()); @@ -149,10 +149,10 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index cd3bc2abbc3..062d4555b9f 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long -Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h index 60fdc9a457b..65fa40ed8b2 100644 --- a/TAO/tests/MT_Server/test_i.h +++ b/TAO/tests/MT_Server/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) + CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 5bf38b970dd..cc078fe6cc9 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -46,22 +46,22 @@ Client_Task::too_big_difference_calls (void) const int Client_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; int successful_calls = 0; int timed_out_calls = 0; ACE_TRY { - this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT timeout_period = 10 * this->timeout_; @@ -74,17 +74,17 @@ Client_Task::svc (void) policy_list[0] = this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeout_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != this->iterations_; ++i) { - int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == 1) @@ -118,13 +118,13 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) +Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { for (int i = 0; i != 100; ++i) { - (void) this->sleep_service_->go_to_sleep (0 TAO_ENV_ARG_PARAMETER); + (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -137,14 +137,14 @@ Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) } int -Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL) +Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { ACE_Time_Value start = ACE_OS::gettimeofday (); this->sleep_service_->go_to_sleep (this->sleep_time_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value end = ACE_OS::gettimeofday (); diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index 8b9ef41cc0e..6bc79a6c3ed 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -46,7 +46,7 @@ public: /// Return the total number of timed out calls int timed_out_calls (void) const; - /// Return the number of calls with a too huge difference in + /// Return the number of calls with a too huge difference in /// timeout versus actual response arrival. int too_big_difference_calls (void) const; @@ -55,10 +55,10 @@ public: private: /// Run one iteration of the test - int one_iteration (TAO_ENV_SINGLE_ARG_DECL); + int one_iteration (ACE_ENV_SINGLE_ARG_DECL); /// Make sure that the thread has a connection available - void validate_connection (TAO_ENV_SINGLE_ARG_DECL); + void validate_connection (ACE_ENV_SINGLE_ARG_DECL); private: /// A reference to the ORB diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp index 34c76abd7bf..863f5f50c64 100644 --- a/TAO/tests/MT_Timeout/Server_Task.cpp +++ b/TAO/tests/MT_Timeout/Server_Task.cpp @@ -18,10 +18,10 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr, int Server_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (this->running_time_ TAO_ENV_ARG_PARAMETER); + this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index 0650e317c9e..b234cb0feb0 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -12,7 +12,7 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb) void Sleep_Service::go_to_sleep (CORBA::ULong microseconds - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong secs = microseconds / 1000000; @@ -23,9 +23,9 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds } void -Sleep_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Sleep_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index b25ddd7a66d..8742185553f 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -26,10 +26,10 @@ public: // = The skeleton methods virtual void go_to_sleep (CORBA::ULong microseconds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index e8b3e285b7c..c2a1eae4ab6 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -51,18 +51,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Sleep_Service_var sleep_service = - Test::Sleep_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sleep_service.in ())) @@ -95,13 +95,13 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); // Get back in sync with the server.. - sleep_service->go_to_sleep (0 TAO_ENV_ARG_PARAMETER); + sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sleep_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + sleep_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 2b60e0c130d..0f95a9e7194 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(sleep_service_impl); Test::Sleep_Service_var process = - sleep_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,7 +86,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Task server_task (ACE_Thread_Manager::instance (), @@ -102,10 +102,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp index 0723c2e42f8..1bc6df52672 100644 --- a/TAO/tests/Multiple/Collocation_Tester.cpp +++ b/TAO/tests/Multiple/Collocation_Tester.cpp @@ -39,7 +39,7 @@ Collocation_Tester::match_answer (const char *actual_answer, } int -Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<TOP>-------------------------------\n"))); @@ -58,7 +58,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n"))); - CORBA::String_var msg = top->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = top->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); @@ -74,7 +74,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) } int -Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n"))); @@ -93,12 +93,12 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n"))); - CORBA::String_var msg = right->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = right->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = right->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = right->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); @@ -115,7 +115,7 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<LEFT>-------------------------------\n"))); @@ -135,12 +135,12 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n"))); - CORBA::String_var msg = left->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = left->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = left->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = left->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); @@ -157,7 +157,7 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n"))); @@ -177,22 +177,22 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n"))); - CORBA::String_var msg = bottom->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = bottom->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = bottom->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); - msg = bottom->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); - msg = bottom->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote"); @@ -208,7 +208,7 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) } void -Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) { Multiple::Top_var top = Multiple::Top::_narrow (this->object_.in ()); @@ -223,23 +223,23 @@ Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n"))); - top->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + top->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL) { - int failure_num = this->test_top (TAO_ENV_SINGLE_ARG_PARAMETER); + int failure_num = this->test_top (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_left (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_left (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_right (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_right (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_bottom (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_bottom (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (failure_num) @@ -249,5 +249,5 @@ Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! "))); - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index 766242232bc..5a22ad55ace 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -39,7 +39,7 @@ public: ~Collocation_Tester (); // -- Command -- - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Runs the test. @@ -47,19 +47,19 @@ private: // -- Helper Methods -- - int test_top (TAO_ENV_SINGLE_ARG_DECL); + int test_top (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Top interface. - int test_right (TAO_ENV_SINGLE_ARG_DECL); + int test_right (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Right interface. - int test_left (TAO_ENV_SINGLE_ARG_DECL); + int test_left (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Left interface. - int test_bottom (TAO_ENV_SINGLE_ARG_DECL); + int test_bottom (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Bottom interface. @@ -72,7 +72,7 @@ private: // is no match (actually 1 is returned if there is // no match. - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: CORBA::Object_var object_; }; diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index d65dfde3c07..54e95ead3e1 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void) } char * -Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::top); } char * -Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::left); } char * -Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::right); } char * -Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::bottom); } void -Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } /////////////////////////////////////////////////////////// @@ -70,64 +70,64 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) } char * -Delegated_Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); CORBA::String_var msg = - this->delegate_->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); CORBA::String_var msg = - this->delegate_->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); CORBA::String_var msg = - this->delegate_->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); CORBA::String_var msg = - this->delegate_->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } void -Delegated_Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); - this->delegate_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); - //this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index e0a563896bc..e97f97ca80e 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -40,27 +40,27 @@ public: virtual ~Bottom_Impl (void); // IDL Interface Methods - virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -89,24 +89,24 @@ public: virtual ~Delegated_Bottom_Impl (void); // IDL Interface Methods. - virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp index 796976b3470..8a2d499abce 100644 --- a/TAO/tests/Multiple/client.cpp +++ b/TAO/tests/Multiple/client.cpp @@ -6,18 +6,18 @@ ACE_RCSID (tests, client, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object; // Get The IOR from a file - object = orb->string_to_object ("file://s.ior" TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -27,7 +27,7 @@ int main (int argc, char *argv[]) } Collocation_Tester tester (object.in ()); - tester.run (TAO_ENV_SINGLE_ARG_PARAMETER); + tester.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index 403530d1b21..4bbaa563fac 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -7,24 +7,24 @@ ACE_RCSID (tests, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Orb Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object; - object = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() TAO_ENV_ARG_PARAMETER); + PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager - PortableServer::POAManager_var poa_manager = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the servant. @@ -41,7 +41,7 @@ int main (int argc, char *argv[]) // Now we stringfy the object reference. CORBA::String_var ior = - orb->object_to_string (bottom.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (bottom.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -58,7 +58,7 @@ int main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Activate the POAManager - poa_manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->run(); diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index 87e8cbe8611..da21a7210b2 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D public: Multiple_Inheritance_i (void); - virtual char* method1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method1"); } - virtual char* method2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method2"); } - virtual char* method3 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method3 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method3"); } - virtual char* method4 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* method4 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method4"); diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index 465cf0e591b..3041b64478e 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -69,12 +69,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR @@ -102,60 +102,60 @@ main (int argc, char **argv) } // Get the object reference with the IOR - CORBA::Object_var object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var string; // Narrow the object reference - A_var a = A::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference - B_var b = B::_narrow (a.in () TAO_ENV_ARG_PARAMETER); + B_var b = B::_narrow (a.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference - C_var c = C::_narrow (a.in () TAO_ENV_ARG_PARAMETER); + C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference - D_var d = D::_narrow (c.in () TAO_ENV_ARG_PARAMETER); + D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - string = a->method1 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = a->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = b->method1 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = b->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = b->method2 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = b->method2 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = c->method1 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = c->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = c->method3 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = c->method3 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method1 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = d->method1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method2 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = d->method2 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method3 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = d->method3 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - string = d->method4 (TAO_ENV_SINGLE_ARG_PARAMETER); + string = d->method4 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); } diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index 4fa16427905..e970bcd85c8 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -48,13 +48,13 @@ main (int argc, char **argv) TAO_ORB_Manager orb_manager; ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { orb_manager.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -63,7 +63,7 @@ main (int argc, char **argv) CORBA::String_var ior = orb_manager.activate_under_child_poa ("my_object", &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", @@ -82,7 +82,7 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); } - orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp index 52a2ea3a368..01960176f11 100644 --- a/TAO/tests/Muxing/Client_Task.cpp +++ b/TAO/tests/Muxing/Client_Task.cpp @@ -27,12 +27,12 @@ Client_Task::svc (void) for (CORBA::ULong j = 0; j != payload.length (); ++j) payload[j] = (j % 256); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (int i = 0; i != this->event_count_; ++i) { - this->receiver_->receive_data (payload TAO_ENV_ARG_PARAMETER); + this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index ddeb77de007..6ffff418f91 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -24,7 +24,7 @@ Receiver::dump_results () void Receiver::receive_data (const Test::Payload &payload - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -33,7 +33,7 @@ Receiver::receive_data (const Test::Payload &payload } CORBA::Long -Receiver::get_event_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index 227c4c785a7..25a45a17d46 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -32,9 +32,9 @@ public: // = The skeleton methods virtual void receive_data (const Test::Payload &payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_event_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index e23e16908a2..828f010158d 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -17,12 +17,12 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // run the test for at most 120 seconds... ACE_Time_Value tv (120, 0); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index f9bc046097b..01e0b962d78 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -38,18 +38,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Receiver_var receiver = - Test::Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (receiver.in ())) @@ -72,13 +72,13 @@ main (int argc, char *argv[]) } ACE_Thread_Manager::instance ()->wait (); - CORBA::Long count = receiver->get_event_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n", count)); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index e2e54be6e31..06a120b2183 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -39,11 +39,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,11 +52,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); Test::Receiver_var receiver = - receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (receiver.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,7 +86,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Task server_task (orb.in (), @@ -100,10 +100,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 14d564729cf..c9037a1145b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -38,7 +38,7 @@ MT_Object_i::~MT_Object_i (void) CORBA::Long MT_Object_i::yadda (CORBA::Long hop_count, MT_Object_ptr partner - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -49,8 +49,8 @@ MT_Object_i::yadda (CORBA::Long hop_count, { if (partner != 0) return partner->yadda (hop_count + 1, - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER) - TAO_ENV_ARG_PARAMETER) + 1; + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) + 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 ccfad73f3ab..de5d9893297 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -37,7 +37,7 @@ public: virtual CORBA::Long yadda (CORBA::Long hop_count, MT_Object_ptr partner - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 61eef4524e8..ad0435e280a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -146,7 +146,7 @@ MT_Client::parse_args (void) int MT_Client::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (unsigned long i = 0; i < this->iterations_; i++) @@ -160,7 +160,7 @@ MT_Client::run (void) // testing this->mT_Object_var_->yadda (0, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -198,7 +198,7 @@ MT_Client::init (int argc, char **argv, this->client_number_ = client_number; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char buf[64]; @@ -208,7 +208,7 @@ MT_Client::init (int argc, char **argv, CORBA::ORB_init (this->argc_, this->argv_, buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -223,7 +223,7 @@ MT_Client::init (int argc, char **argv, CORBA::Object_var object_var = this->orb_var_->string_to_object (this->object_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -232,7 +232,7 @@ MT_Client::init (int argc, char **argv, -1); this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -246,7 +246,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" TAO_ENV_ARG_PARAMETER); + this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -255,14 +255,14 @@ MT_Client::init (int argc, char **argv, 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -282,14 +282,14 @@ MT_Client::init (int argc, char **argv, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Manager orb_manager; int r = orb_manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index fff693f2e46..6f83e38af9f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -142,7 +142,7 @@ MT_Server::init (int argc, "MT_Server::init: ORB_Manager is nil!\n"), -1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Call the init of TAO_ORB_Manager to create a child POA @@ -150,7 +150,7 @@ MT_Server::init (int argc, this->orb_manager_ptr_->init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -160,7 +160,7 @@ MT_Server::init (int argc, this->str_ = this->orb_manager_ptr_->activate_under_child_poa ("MT", &this->mT_Object_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -185,7 +185,7 @@ MT_Server::init (int argc, CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -194,7 +194,7 @@ MT_Server::init (int argc, -1); this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -220,10 +220,10 @@ MT_Server::init (int argc, int MT_Server::run () { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = this->orb_manager_ptr_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) @@ -245,12 +245,12 @@ MT_Server::~MT_Server (void) if (this->object_key_ != 0) ACE_OS::free (this->object_key_); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (this->orb_manager_ptr_) this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -266,7 +266,7 @@ MT_Server::run_ORB_briefly (void) { if (this->iterations_ > 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_DEBUG ((LM_DEBUG, @@ -276,12 +276,12 @@ MT_Server::run_ORB_briefly (void) for (unsigned int i = 0; i < this->iterations_; i++) { MT_Object_var tmp = - this->mT_Object_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->mT_Object_var_->yadda (0, tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index a259d0c2f74..2fe47240f78 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -64,14 +64,14 @@ MT_Object_Server::parse_args (void) int MT_Object_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -104,9 +104,9 @@ MT_Object_Server::init (int argc, int -MT_Object_Server::run (TAO_ENV_SINGLE_ARG_DECL) +MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "NestedUpCalls_Server::run"), -1); @@ -125,17 +125,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = MT_Object_Server.init (argc,argv TAO_ENV_ARG_PARAMETER); + int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; else { - MT_Object_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + MT_Object_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index b8d72823b9e..0ae8e9d6633 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 63e789b52b3..33dc4890f6a 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -50,7 +50,7 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), call_count - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -121,7 +121,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -130,34 +130,34 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_var server = server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_tasks (client_object.in (), @@ -167,13 +167,13 @@ main (int argc, if (shutdown_server) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp index 3e1d975fb28..af61f40ba94 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp @@ -11,7 +11,7 @@ client_i::client_i (int quiet, void client_i::ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -24,7 +24,7 @@ client_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { this->server_->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h index d384e305791..c90a070e907 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.h +++ b/TAO/tests/NestedUpcall/Simple/client_i.h @@ -10,7 +10,7 @@ public: // Constructor. void ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 75312958193..59b29310415 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -33,10 +33,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb) int Server_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -121,7 +121,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -130,29 +130,29 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; server_i server_servant (quiet, orb.in ()); - server_var server_object = server_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_var server_object = server_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = write_ior_to_file (ior.in ()); @@ -174,7 +174,7 @@ main (int argc, root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index 9bf81230998..6e6a9b7ade4 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -12,12 +12,12 @@ server_i::server_i (int quiet, void server_i::start (client_ptr c, CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_ = client::_duplicate (c); this->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -25,7 +25,7 @@ server_i::start (client_ptr c, void server_i::ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -38,16 +38,16 @@ server_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { this->client_->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index 805606b8a32..a92ecc85d08 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -9,15 +9,15 @@ public: CORBA::ORB_ptr orb); void ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void start (client_ptr c, CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index ed8c279cd01..a014035dc5e 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -53,7 +53,7 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), call_count - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -130,7 +130,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -139,34 +139,34 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_var server = server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_tasks (client_object.in (), @@ -177,13 +177,13 @@ main (int argc, if (shutdown_server) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index 67053270013..2b525bac4ea 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -36,7 +36,7 @@ Initiator_i::~Initiator_i (void) } void -Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL) +Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { this->object_B_var_->foo (this->object_A_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index ab5133bbb28..50f01bf658f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,7 +35,7 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (TAO_ENV_SINGLE_ARG_DECL) + virtual void foo_object_B (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index ec7adc6c3f4..f113dd6e48a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -39,7 +39,7 @@ Object_A_i::~Object_A_i (void) void Object_A_i::foo (Initiator_ptr theInitiator_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -47,7 +47,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr ACE_TRY { - theInitiator_ptr->foo_object_B (TAO_ENV_SINGLE_ARG_PARAMETER); + theInitiator_ptr->foo_object_B (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; while (!this->finish_two_way_call_) @@ -64,7 +64,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr } void -Object_A_i::finish (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_A_i::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 6831a81039b..83c771f5a6f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -35,10 +35,10 @@ public: // Destructor. virtual void foo (Initiator_ptr theInitiator_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void finish (TAO_ENV_SINGLE_ARG_DECL) + virtual void finish (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); unsigned long finish_two_way_call_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 94654d06bd5..2373ce9b400 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -36,7 +36,7 @@ Object_B_i::~Object_B_i (void) void Object_B_i::foo (Object_A_ptr theObject_A_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -48,7 +48,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n")); - theObject_A_ptr->finish (TAO_ENV_SINGLE_ARG_PARAMETER); + theObject_A_ptr->finish (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start to wait on this variable, it is set to true diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index d4468a9372c..c76b4d2ab80 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -35,7 +35,7 @@ public: // Destructor. virtual void foo(Object_A_ptr theObject_A_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 78bb62a8a1b..e4011a3a2e5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -120,14 +120,14 @@ Initiator_Server::parse_args (void) int Initiator_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -148,11 +148,11 @@ Initiator_Server::init (int argc, CORBA::Object_var object_A_obj_var = this->orb_manager_.orb()->string_to_object (this->object_A_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->object_A_var_ = - Object_A::_narrow (object_A_obj_var.in() TAO_ENV_ARG_PARAMETER); + Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->object_A_var_.in ())) @@ -170,11 +170,11 @@ Initiator_Server::init (int argc, CORBA::Object_var object_B_obj_var = this->orb_manager_.orb()->string_to_object (this->object_B_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->object_B_var_ = - Object_B::_narrow (object_B_obj_var.in() TAO_ENV_ARG_PARAMETER); + Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->object_B_var_.in ())) @@ -188,7 +188,7 @@ Initiator_Server::init (int argc, this->object_A_key_)); ACE_DEBUG ((LM_DEBUG, "Object B received OK\n")); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -210,7 +210,7 @@ Initiator_Server::init (int argc, this->str_ = this->orb_manager_.activate (this->initiator_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", this->str_.in ())); @@ -221,7 +221,7 @@ Initiator_Server::init (int argc, int -Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -230,10 +230,10 @@ Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL) "foo on Object A\n")); Initiator_var initiator = - this->initiator_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + this->initiator_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->object_A_var_->foo (initiator.in () TAO_ENV_ARG_PARAMETER); + this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Initiator_Server::run: Returned from invoke " @@ -261,11 +261,11 @@ Initiator_Server::~Initiator_Server (void) if (this->object_B_key_ != 0) ACE_OS::free (this->object_B_key_); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->orb_manager_.deactivate (this->str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -285,18 +285,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int retval = - initiator_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - initiator_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + initiator_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index c67ca955c21..897729b0d41 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -52,10 +52,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Initiator_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index e43921d9291..1311c2ffb48 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -64,14 +64,14 @@ Object_A_Server::parse_args (void) int Object_A_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,7 @@ Object_A_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_A", &this->object_A_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -104,9 +104,9 @@ Object_A_Server::init (int argc, int -Object_A_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Object_A_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (r == -1) @@ -128,18 +128,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int retval = - object_A_Server.init (argc,argv TAO_ENV_ARG_PARAMETER); + object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_A_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + object_A_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index b2722bb822f..289a0e9970a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 5a692acab73..e9a59878311 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -64,14 +64,14 @@ Object_B_Server::parse_args (void) int Object_B_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,7 @@ Object_B_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_B", &this->object_B_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -103,9 +103,9 @@ Object_B_Server::init (int argc, int -Object_B_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Object_B_Server::run"), -1); @@ -124,17 +124,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = object_B_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_B_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + object_B_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 783eaa652a2..5e445e3d39e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index f10cf46ab27..ac198b31bd6 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -70,7 +70,7 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -79,7 +79,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -89,48 +89,48 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an object reference from the argument string. object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <server> reference. server_var server_object = server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client_i servant (server_object.in ()); servant.loop (event_loop_depth, event_loop_iterations - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shutdown server. if (shutdown_server) { - server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 869da38609d..134bd31f46a 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -44,21 +44,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -67,12 +67,12 @@ main (int argc, char *argv[]) server_i servant (orb.in ()); server_var server_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,17 +86,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 2f1fca6d3e6..e75585b0e46 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -13,7 +13,7 @@ void server_i::loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -23,27 +23,27 @@ server_i::loop (client_ptr remote_partner, this->run_no_ops (remote_partner, event_loop_iterations / 2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (--event_loop_depth != 0) { remote_partner->loop (event_loop_depth, event_loop_iterations - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } this->run_no_ops (remote_partner, event_loop_iterations / 2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void server_i::run_no_ops (client_ptr remote_partner, CORBA::ULong iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { while (iterations != 0) @@ -72,12 +72,12 @@ server_i::run_no_ops (client_ptr remote_partner, remote_partner->oneway_no_op (act_for_iterations, act_for_flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; while (!got_reply) { - this->orb_->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -87,7 +87,7 @@ void server_i::no_op (client_ptr remote_partner, const act &act_for_iterations, const act &act_for_flag - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong *pointer_to_iterations = 0; @@ -110,16 +110,16 @@ server_i::no_op (client_ptr remote_partner, *pointer_to_flag = 1; - remote_partner->twoway_no_op (TAO_ENV_SINGLE_ARG_PARAMETER); + remote_partner->twoway_no_op (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } client_i::client_i (server_ptr remote_partner) @@ -130,7 +130,7 @@ client_i::client_i (server_ptr remote_partner) void client_i::loop (CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -138,18 +138,18 @@ client_i::loop (CORBA::ULong event_loop_depth, event_loop_depth, event_loop_iterations)); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { client_var self = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->remote_partner_->loop (self.in (), event_loop_depth, event_loop_iterations - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -163,21 +163,21 @@ client_i::loop (CORBA::ULong event_loop_depth, void client_i::oneway_no_op (const act &act_for_iterations, const act &act_for_flag - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { client_var self = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->remote_partner_->no_op (self.in (), act_for_iterations, act_for_flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -189,7 +189,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } void -client_i::twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +client_i::twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h index 6a4f6afef7c..37d1b80f541 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.h +++ b/TAO/tests/Nested_Event_Loop/test_i.h @@ -10,21 +10,21 @@ public: void loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void run_no_ops (client_ptr remote_partner, CORBA::ULong iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void no_op (client_ptr remote_partner, const act &act_for_iterations, const act &act_for_flag - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -38,15 +38,15 @@ public: void loop (CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void oneway_no_op (const act &act_for_iterations, const act &act_for_flag - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index a72282b7b70..93bdea4f54e 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -13,7 +13,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) CORBA::Any* Test_impl::get_something ( CORBA::Boolean need_vb - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret_val; @@ -47,8 +47,8 @@ Test_impl::get_something ( } void -Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index 1a22a2ae45c..d33df851ddc 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -33,10 +33,10 @@ public: virtual CORBA::Any * get_something ( CORBA::Boolean need_vb - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index e66581f45f7..d05b02b2331 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -42,45 +42,45 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n")); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - // Create and register factories. - - OBV_AnyTest::VA_init *va_factory = 0; - ACE_NEW_RETURN (va_factory, + // Create and register factories. + + OBV_AnyTest::VA_init *va_factory = 0; + ACE_NEW_RETURN (va_factory, OBV_AnyTest::VA_init, 1); // supplied by mapping orb->register_value_factory (va_factory->tao_repository_id (), va_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; va_factory->_remove_ref (); // release ownership - OBV_AnyTest::VB_init *vb_factory = 0; - ACE_NEW_RETURN (vb_factory, + OBV_AnyTest::VB_init *vb_factory = 0; + ACE_NEW_RETURN (vb_factory, OBV_AnyTest::VB_init, 1); // supplied by mapping orb->register_value_factory (vb_factory->tao_repository_id (), vb_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; vb_factory->_remove_ref (); // release ownership // Obtain reference to the object CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; OBV_AnyTest::Test_var test = - OBV_AnyTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -93,7 +93,7 @@ main (int argc, char *argv[]) // Do local test - OBV_AnyTest::VA_var va1, va2; + OBV_AnyTest::VA_var va1, va2; ACE_NEW_RETURN (va1, OBV_OBV_AnyTest::VA, 1); ACE_NEW_RETURN (va2, OBV_OBV_AnyTest::VA, 1); @@ -106,7 +106,7 @@ main (int argc, char *argv[]) // Test both copying and non-copying version of operator<<= a1 <<= va1.in (); - + OBV_AnyTest::VA *pva = va2._retn(); a2 <<= &pva; @@ -114,29 +114,29 @@ main (int argc, char *argv[]) if (!(a1 >>= dst) || dst->id () != magic) { - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_DEBUG, "(%P|%t) client - test failed.\n"), 1); } if (!(a2 >>= dst) || dst->id () != magic) { - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_DEBUG, "(%P|%t) client - test failed.\n"), 1); } // Now do remote test - + // STEP 1. CORBA::Any_var result = test->get_something ( 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!(*result >>= dst) || dst->id () != magic) { - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_DEBUG, "(%P|%t) client - test failed.\n"), 1); } @@ -145,20 +145,20 @@ main (int argc, char *argv[]) OBV_AnyTest::VB* dst_vb = 0; result = test->get_something ( 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!(*result >>= dst_vb) || dst_vb->id () != magic) { - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_DEBUG, "(%P|%t) client - test failed.\n"), 1); } - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n")); diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index 43e37869510..7b8ac3453bb 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -70,11 +70,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); OBV_AnyTest::Test_var test = - test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -87,20 +87,20 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n")); - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index c317f605e8b..49bd2e9401b 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) } OBV_FactoryTest::BaseValue * -Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::BaseValue* ret_val = 0; @@ -24,7 +24,7 @@ Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } OBV_FactoryTest::Value1 * -Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value1* ret_val = 0; @@ -36,7 +36,7 @@ Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } OBV_FactoryTest::Value2 * -Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value2* ret_val = 0; @@ -48,8 +48,8 @@ Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h index 00c41b901d3..8a1e97a6a5a 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.h +++ b/TAO/tests/OBV/Factory/FactoryS_impl.h @@ -31,16 +31,16 @@ public: Test_impl (CORBA::ORB_ptr orb); // ctor - virtual OBV_FactoryTest::BaseValue * get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual OBV_FactoryTest::Value1 * get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual OBV_FactoryTest::Value2 * get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp index 2d73e319292..1ccfce1b4a2 100644 --- a/TAO/tests/OBV/Factory/client.cpp +++ b/TAO/tests/OBV/Factory/client.cpp @@ -40,59 +40,59 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - // Create factories. - - OBV_FactoryTest::BaseValue_init *base_factory = 0; - ACE_NEW_RETURN (base_factory, + // Create factories. + + OBV_FactoryTest::BaseValue_init *base_factory = 0; + ACE_NEW_RETURN (base_factory, OBV_FactoryTest::BaseValue_init, 1); // supplied by mapping orb->register_value_factory (base_factory->tao_repository_id (), - base_factory - TAO_ENV_ARG_PARAMETER); + base_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; base_factory->_remove_ref (); // release ownership OBV_FactoryTest::Value1_init *value1_factory = 0; - ACE_NEW_RETURN (value1_factory, + ACE_NEW_RETURN (value1_factory, OBV_FactoryTest::Value1_init, 1); // supplied by mapping orb->register_value_factory (value1_factory->tao_repository_id (), value1_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; value1_factory->_remove_ref (); - + OBV_FactoryTest::Value2_init *value2_factory = 0; - ACE_NEW_RETURN (value2_factory, + ACE_NEW_RETURN (value2_factory, Value2_init_impl, 1); // custom implementation orb->register_value_factory (value2_factory->tao_repository_id (), - value2_factory - TAO_ENV_ARG_PARAMETER); + value2_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; value2_factory->_remove_ref (); // Obtain reference to the object CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; OBV_FactoryTest::Test_var test = - OBV_FactoryTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -103,22 +103,22 @@ main (int argc, char *argv[]) 1); } - // Now perform the test. I don't check return values. + // Now perform the test. I don't check return values. // I just hope to get MARSHAL. - OBV_FactoryTest::BaseValue_var base_value = - test->get_base_value (TAO_ENV_SINGLE_ARG_PARAMETER); + OBV_FactoryTest::BaseValue_var base_value = + test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - OBV_FactoryTest::Value1_var value1 = - test->get_value1 (TAO_ENV_SINGLE_ARG_PARAMETER); + OBV_FactoryTest::Value1_var value1 = + test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - OBV_FactoryTest::Value2_var value2 = - test->get_value2 (TAO_ENV_SINGLE_ARG_PARAMETER); + OBV_FactoryTest::Value2_var value2 = + test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test factories. - + value2 = value2_factory->create_default (1); OBV_FactoryTest::BaseValue::BV_Data data; @@ -128,10 +128,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 00b6d8d8eb2..af5c6e5ce19 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -70,11 +70,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); OBV_FactoryTest::Test_var test = - test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -87,18 +87,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index 207f1cbce9a..bfc72998512 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -31,7 +31,7 @@ reflect_node (BaseNode_ptr bn) TreeController * Test_impl::reflect (TreeController * tc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) @@ -43,8 +43,8 @@ Test_impl::reflect (TreeController * tc } void -Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index 50b172bdf4f..745f255ad87 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -33,10 +33,10 @@ public: virtual TreeController * reflect ( TreeController * tc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index cb4860dae7c..b71178be956 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) return 0; } -void +void dump_node (BaseNode_ptr bn, int indent) { if (bn == 0) return; @@ -51,29 +51,29 @@ dump_node (BaseNode_ptr bn, int indent) { ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n", bn, - sn->name ())); + sn->name ())); } else { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "%x <BaseNode> \n", - bn)); + bn)); } dump_node (bn->left (), indent + 1); dump_node (bn->right (), indent + 1); } -void +void dump_tree (TreeController_ptr tc) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%P|%t) start tree dump <%x>\n", tc)); dump_node (tc->root (), 1); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%P|%t) end tree dump <%x>\n", tc)); } @@ -85,7 +85,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -95,38 +95,38 @@ main (int argc, char *argv[]) // compiler so we just to put everything in a right order. // Create and register factory for BaseNode. - BaseNode_init *bn_factory = 0; - ACE_NEW_RETURN (bn_factory, + BaseNode_init *bn_factory = 0; + ACE_NEW_RETURN (bn_factory, BaseNode_init, 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - TAO_ENV_ARG_PARAMETER); + bn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. - TreeController_init *tc_factory = 0; - ACE_NEW_RETURN (tc_factory, + TreeController_init *tc_factory = 0; + ACE_NEW_RETURN (tc_factory, TreeController_init, 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - TAO_ENV_ARG_PARAMETER); + tc_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. - StringNode_init *sn_factory = 0; - ACE_NEW_RETURN (sn_factory, + StringNode_init *sn_factory = 0; + ACE_NEW_RETURN (sn_factory, StringNode_init, 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - TAO_ENV_ARG_PARAMETER); + sn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership @@ -134,10 +134,10 @@ main (int argc, char *argv[]) // Obtain reference to the object. CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var test = Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -149,16 +149,16 @@ main (int argc, char *argv[]) } // Now build simple graph (tree in our case). - + TreeController_var tc; - ACE_NEW_RETURN (tc, + ACE_NEW_RETURN (tc, OBV_TreeController, 1); // Create the root node. { StringNode_var sn; - ACE_NEW_RETURN (sn, + ACE_NEW_RETURN (sn, OBV_StringNode, 1); sn->name ((const char*)("RootNode")); @@ -167,17 +167,17 @@ main (int argc, char *argv[]) // Create the left leaf. { StringNode_var dummy; - ACE_NEW_RETURN (dummy, + ACE_NEW_RETURN (dummy, OBV_StringNode, 1); dummy->name ((const char*)("LeftNode")); - sn->left (dummy); + sn->left (dummy); } // Create the right leaf. { StringNode_var dummy; - ACE_NEW_RETURN (dummy, + ACE_NEW_RETURN (dummy, OBV_StringNode, 1); dummy->name ((const char*)("RightNode")); @@ -186,23 +186,23 @@ main (int argc, char *argv[]) // dummy->right (sn); // ;-) } } - + // Dump the tree. dump_tree (tc.in ()); - TreeController_var result_tc = - test->reflect (tc.in () TAO_ENV_ARG_PARAMETER); + TreeController_var result_tc = + test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Dump the resulting tree. dump_tree (result_tc.in ()); - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index afd06f22f66..f1935936260 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -43,56 +43,56 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // All factories are kindly provided by // compiler so we just to put everything in a right order. // Create and register factory for BaseNode. - BaseNode_init *bn_factory = 0; - ACE_NEW_RETURN (bn_factory, + BaseNode_init *bn_factory = 0; + ACE_NEW_RETURN (bn_factory, BaseNode_init, 1); orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. - TreeController_init *tc_factory = 0; - ACE_NEW_RETURN (tc_factory, + TreeController_init *tc_factory = 0; + ACE_NEW_RETURN (tc_factory, TreeController_init, 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - TAO_ENV_ARG_PARAMETER); + tc_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. - StringNode_init *sn_factory = 0; - ACE_NEW_RETURN (sn_factory, + StringNode_init *sn_factory = 0; + ACE_NEW_RETURN (sn_factory, StringNode_init, 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - TAO_ENV_ARG_PARAMETER); + sn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -101,7 +101,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -114,11 +114,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -131,18 +131,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index 40cfa51f3b0..193375498ab 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -28,39 +28,39 @@ test_with_regular_poa_manager (int argc, int destroy_orb, int destroy_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (destroy_poa) { - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -83,42 +83,42 @@ test_with_funky_poa_manager (int argc, int destroy_poa, int funky_poa_manager) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (funky_poa_manager) { PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (destroy_poa) { - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (destroy_orb) { - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp index 77814057eb1..7ffb4d68189 100644 --- a/TAO/tests/ORB_init/ORB_init.cpp +++ b/TAO/tests/ORB_init/ORB_init.cpp @@ -17,7 +17,7 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { const char orbid[] = "mighty_orb"; @@ -25,7 +25,7 @@ main (int argc, char *argv[]) CORBA::ORB_ptr my_orb = CORBA::ORB::_nil(); { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; my_orb = orb.in (); @@ -42,7 +42,7 @@ main (int argc, char *argv[]) // used in that scope. // ------------------------------------------------------------- - orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -77,10 +77,10 @@ main (int argc, char *argv[]) // attempt to initialize a new ORB with the same ORBid. // ------------------------------------------------------------- - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -116,7 +116,7 @@ main (int argc, char *argv[]) // ------------------------------------------------------------- CORBA::Object_var object = - orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); + orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ------------------------------------------------------------- @@ -125,11 +125,11 @@ main (int argc, char *argv[]) // clean-up. // ------------------------------------------------------------- CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "ORB number 2" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb3 = - CORBA::ORB_init (argc, argv, "ORB number 3" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ------------------------------------------------------------- @@ -139,11 +139,11 @@ main (int argc, char *argv[]) // ORB itself break when the last ORB is released. // ------------------------------------------------------------- - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If we get here, then something went wrong. A diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp index 1c3be70c827..e93543879ed 100644 --- a/TAO/tests/ORB_init/Portspan/server.cpp +++ b/TAO/tests/ORB_init/Portspan/server.cpp @@ -9,30 +9,30 @@ main( int argc, char *argv[] ) { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POAManager_var man = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var man = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - man->activate(TAO_ENV_SINGLE_ARG_PARAMETER); + man->activate(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; simple_i simp; PortableServer::ObjectId_var objId = poa->activate_object(&simp - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp index 6e7d6a4dd69..6a7620307a6 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.cpp +++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp @@ -32,7 +32,7 @@ simple_i::~simple_i (void) } void simple_i::test ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h index 6cf337231f1..23faf5eb717 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.h +++ b/TAO/tests/ORB_init/Portspan/simpleI.h @@ -39,7 +39,7 @@ public: virtual ~simple_i (void); virtual void test ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index 9efa44bb399..0cf6b2ee705 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -15,14 +15,14 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor () } char * -ORT_test_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ORT_IORInterceptor"); } void -ORT_test_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -30,11 +30,11 @@ ORT_test_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ORT_test_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr /* info */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->establish_count_; - + ACE_DEBUG ((LM_DEBUG, "Establish_Components is invoked %d times till now\n", this->establish_count_)); @@ -46,7 +46,7 @@ components_established (PortableInterceptor::IORInfo_ptr /* ior_info */) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->components_establish_count_; - + ACE_DEBUG ((LM_DEBUG, "Components Established is invoked %d times till now\n", this->establish_count_)); diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index fd945e7ab04..cbfd83f23c9 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -36,42 +36,42 @@ class ORT_test_IORInterceptor : */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. virtual void establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} private: - + CORBA::Long establish_count_; - + CORBA::Long components_establish_count_; }; diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp index 9ca7443b52c..bdc039aa6e2 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp @@ -11,7 +11,7 @@ ACE_RCSID (ORT, void ORT_test_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -19,7 +19,7 @@ ORT_test_IORInterceptor_ORBInitializer::pre_init ( void ORT_test_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::IORInterceptor_ptr ort_test_interceptor; @@ -36,7 +36,7 @@ ORT_test_IORInterceptor_ORBInitializer::post_init ( ort_test_interceptor; info->add_ior_interceptor (ior_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h index 347170309a3..2920818bce1 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h @@ -28,12 +28,12 @@ class ORT_test_IORInterceptor_ORBInitializer //@{ /// The pre-initialization hook. virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index bd8aff07e3e..d8a676db4e7 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -11,7 +11,7 @@ ORT_test_i::ORT_test_i () } CORBA::Boolean -ORT_test_i::request_server (TAO_ENV_SINGLE_ARG_DECL) +ORT_test_i::request_server (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h index 9b8dc6f2c4a..572bb62fb06 100644 --- a/TAO/tests/ORT/ORT_test_i.h +++ b/TAO/tests/ORT/ORT_test_i.h @@ -25,7 +25,7 @@ class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test /// Constructor ORT_test_i (); - CORBA::Boolean request_server (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Boolean request_server (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index 6dbb98ce4d1..64c4dbab2ae 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -40,19 +40,19 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_sum_orb" TAO_ENV_ARG_DECL); + CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_DECL); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior TAO_ENV_ARG_DECL); + orb->string_to_object (ior ACE_ENV_ARG_DECL); ACE_TRY_CHECK; ObjectReferenceTemplate::ORT_test_var server = ObjectReferenceTemplate::ORT_test::_narrow (obj.in () - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -68,7 +68,7 @@ main (int argc, char *argv[]) // No need initialize twice. CORBA::Boolean result = 1; - result = server->request_server (TAO_ENV_SINGLE_ARG_DECL); + result = server->request_server (ACE_ENV_SINGLE_ARG_DECL); ACE_TRY_CHECK; if (result == 0) diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp index a949f34dc79..4e66588b2de 100644 --- a/TAO/tests/ORT/server.cpp +++ b/TAO/tests/ORT/server.cpp @@ -53,7 +53,7 @@ int main (int argc, char *argv[]) orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -62,7 +62,7 @@ int main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -70,13 +70,13 @@ int main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for nil references @@ -87,18 +87,18 @@ int main (int argc, char *argv[]) // Get poa_manager reference PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Activate it. - poa_manager->activate (TAO_ENV_ARG_PARAMETER); + /// Activate it. + poa_manager->activate (ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //@} // First lets check if the new -ORBId, -ORBServerId options are // working correctly. - // @@ Priyanka, use "orb->id (TAO_ENV_SINGLE_ARG_PARAMETER)" + // @@ Priyanka, use "orb->id (ACE_ENV_SINGLE_ARG_PARAMETER)" // here. It is standard and portable. Don't forget the // ACE_TRY_CHECK. // @@ On second thought. The ORB_init test already tests the @@ -130,40 +130,40 @@ int main (int argc, char *argv[]) root_poa->create_POA ("FIRST_POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var second_poa = root_poa->create_POA ("SECOND_POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var third_poa = first_poa->create_POA ("THIRD_POA", - poa_manager.in (), - policies - TAO_ENV_ARG_PARAMETER); + poa_manager.in (), + policies + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var fourth_poa = second_poa->create_POA ("FOURTH_POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ORT_test_i ort_test_impl; - // Activate - obj = ort_test_impl._this (TAO_ENV_ARG_PARAMETER); + /// Activate + obj = ort_test_impl._this (ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it down. ObjectReferenceTemplate::ORT_test_var ort_test = ObjectReferenceTemplate::ORT_test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for nil reference @@ -176,7 +176,7 @@ int main (int argc, char *argv[]) // Convert the object reference to a string format. CORBA::String_var ior = - orb->object_to_string (ort_test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ort_test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the IOR to it. @@ -193,7 +193,7 @@ int main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_ARG_PARAMETER); + orb->run (ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 8c2f2c62553..792ccb496a4 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -17,24 +17,24 @@ CORBA::Object_ptr Loader::create_object (CORBA::ORB_ptr orb, int, char * [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_i *test; @@ -42,7 +42,7 @@ Loader::create_object (CORBA::ORB_ptr orb, CORBA::Object::_nil ()); PortableServer::ServantBase_var tmp = test; - obj = test->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return obj._retn (); diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index 7dbcbed351d..7451744993f 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -33,7 +33,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv [] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 2bdf3980984..af7f919ab6c 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -18,28 +18,28 @@ Test_i::Test_i (PortableServer::POA_ptr poa) } CORBA::Long -Test_i::instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Test_i::instance_count_; } void -Test_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Test_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -Test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 4c9a9ad70d3..83adb188234 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -37,13 +37,13 @@ public: Test_i (PortableServer::POA_ptr poa); // ctor - CORBA::Long instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Long instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index 5cf0f232ce8..2d2ee3842a0 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -22,20 +22,20 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = orb->string_to_object ("DLL:Test_Object" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var test = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Long count = - test->instance_count (TAO_ENV_SINGLE_ARG_PARAMETER); + test->instance_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (count != norbs*i + j + 1) @@ -45,7 +45,7 @@ main (int, char *[]) "(%d != %d)\n", count, norbs * i + j + 1)); } - test->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + test->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -57,22 +57,22 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 6ab217974cb..28ad3472bef 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; @@ -44,7 +44,7 @@ main (int argc, char *argv []) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -53,11 +53,11 @@ main (int argc, char *argv []) // Connect to the server CORBA::Object_var tmp = orb->string_to_object(ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Server_var server = Server::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create object instances @@ -83,7 +83,7 @@ main (int argc, char *argv []) server->CreateExtra (iAddSize, vAddition.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -113,12 +113,12 @@ main (int argc, char *argv []) "(%P|%t) Call delete on the server \n")); server->DeleteExtra (vServers.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown \n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index e4899d1bd61..a8654295711 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -13,14 +13,14 @@ public: void CreateExtra (CORBA::ULong length, ServerSequence_out seq - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void DeleteExtra (const ServerSequence &seq - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -43,7 +43,7 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa, void ServerServant::CreateExtra (CORBA::ULong len, ServerSequence_out seq - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -79,7 +79,7 @@ ServerServant::CreateExtra (CORBA::ULong len, void ServerServant::DeleteExtra (const ServerSequence &seq - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -108,10 +108,10 @@ ServerServant::DeleteExtra (const ServerSequence &seq } void -ServerServant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +ServerServant::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } /******************************************************/ @@ -147,7 +147,7 @@ int main (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; if (parse_args (argc, argv) == -1) return -1; @@ -159,17 +159,17 @@ main (int argc, char *argv []) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var vRootPOABase = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (vRootPOABase.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -178,7 +178,7 @@ main (int argc, char *argv []) 1); PortableServer::POAManager_ptr pRootPOAManager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate the server @@ -192,13 +192,13 @@ main (int argc, char *argv []) PortableServer::ServantBase_var owner_transfer(servant); Server_var server = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Announce the server CORBA::String_var obj_ref = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> @@ -211,18 +211,18 @@ main (int argc, char *argv []) ACE_OS::fprintf (output_file, "%s", obj_ref.in ()); ACE_OS::fclose (output_file); - pRootPOAManager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + pRootPOAManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index ed40d39c960..bbf7b834f51 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -161,13 +161,13 @@ run (char* buf, size_t bufsize, int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int n = 64; diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 0af72bbd4ae..e01eefd717f 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -57,18 +57,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Database_var server = - Test::Database::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -113,7 +113,7 @@ main (int argc, char *argv[]) elements[j], token, returned_token - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (token != returned_token) @@ -127,7 +127,7 @@ main (int argc, char *argv[]) } CORBA::ULong crc_remote = - server->get_crc (idx TAO_ENV_ARG_PARAMETER); + server->get_crc (idx ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong crc_local = @@ -149,10 +149,10 @@ main (int argc, char *argv[]) } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index 8dfbfe81e03..905f1963676 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -66,11 +66,11 @@ main (int argc, char *argv[]) 128); // @@ TODO Test::Database_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -88,19 +88,19 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index 29614b938e3..c02f16a8fdf 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -18,7 +18,7 @@ Database_i::set (Test::Index i, const Test::OctetSeq& seq, CORBA::Double verification_token, CORBA::Double_out returned_token - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::OutOfRange)) { if (i >= this->max_range_) @@ -45,7 +45,7 @@ Database_i::set (Test::Index i, Test::OctetSeq* Database_i::get (Test::Index i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) @@ -61,7 +61,7 @@ Database_i::get (Test::Index i CORBA::ULong Database_i::get_crc (Test::Index i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) @@ -73,7 +73,7 @@ Database_i::get_crc (Test::Index i } void -Database_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Database_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h index 08843c32828..ade6a84e861 100644 --- a/TAO/tests/OctetSeq/test_i.h +++ b/TAO/tests/OctetSeq/test_i.h @@ -36,18 +36,18 @@ public: const Test::OctetSeq& seq, CORBA::Double verification_token, CORBA::Double_out returned_token - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((Test::OutOfRange)); Test::OctetSeq* get (Test::Index i - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); CORBA::ULong get_crc (Test::Index i - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index f12cbec55dd..9942c6020d6 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -14,28 +14,28 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb, void Oneway_Buffering::receive_data (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER); + this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER); } void -Oneway_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Oneway_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER); + this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); } void -Oneway_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index 4ea1dd52b64..67ad60edbf3 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -27,16 +27,16 @@ public: // = The skeleton methods virtual void receive_data (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (TAO_ENV_SINGLE_ARG_DECL) + virtual void flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync (TAO_ENV_SINGLE_ARG_DECL) + virtual void sync (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index bf3413506f7..a04178e6012 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -13,14 +13,14 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb) } CORBA::ULong -Oneway_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong -Oneway_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; @@ -28,7 +28,7 @@ Oneway_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; @@ -36,14 +36,14 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length } void -Oneway_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Oneway_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Oneway_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index bce8067204a..bb425d7c6f2 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -25,20 +25,20 @@ public: Oneway_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_received (CORBA::ULong payload_length - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void flush (TAO_ENV_SINGLE_ARG_DECL) + virtual void flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index 874f6f9c508..58bf8444817 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl); Test::Oneway_Buffering_Admin_var oneway_buffering_admin = - oneway_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (oneway_buffering_admin.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index b7dfdc27606..7eda2b53f00 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -88,25 +88,25 @@ int run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_timeout_reactive (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) @@ -115,18 +115,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Oneway_Buffering_var oneway_buffering = - Test::Oneway_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (oneway_buffering.in ())) @@ -138,11 +138,11 @@ main (int argc, char *argv[]) } tmp = - orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Oneway_Buffering_Admin_var oneway_buffering_admin = - Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (oneway_buffering_admin.in ())) @@ -161,7 +161,7 @@ main (int argc, char *argv[]) run_message_count (orb.in (), oneway_buffering.in (), oneway_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_timeout_test) @@ -172,7 +172,7 @@ main (int argc, char *argv[]) run_timeout (orb.in (), oneway_buffering.in (), oneway_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_timeout_reactive_test) @@ -183,7 +183,7 @@ main (int argc, char *argv[]) run_timeout_reactive (orb.in (), oneway_buffering.in (), oneway_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (run_buffer_size_test) @@ -194,7 +194,7 @@ main (int argc, char *argv[]) run_buffer_size (orb.in (), oneway_buffering.in (), oneway_buffering_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -203,13 +203,13 @@ main (int argc, char *argv[]) "ERROR: No test was configured\n")); } - oneway_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - oneway_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -228,14 +228,14 @@ configure_policies (CORBA::ORB_ptr orb, const TAO::BufferingConstraint &buffering_constraint, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_out flusher - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy_current.in ())) @@ -253,21 +253,21 @@ configure_policies (CORBA::ORB_ptr orb, policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO::BufferingConstraint flush_constraint; @@ -281,20 +281,20 @@ configure_policies (CORBA::ORB_ptr orb, policies[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = oneway_buffering->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); flusher = - Test::Oneway_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -302,12 +302,12 @@ configure_policies (CORBA::ORB_ptr orb, void sync_server (Test::Oneway_Buffering_ptr flusher - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get back in sync with the server... - flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER); + flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER); + flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -315,16 +315,16 @@ int run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_ptr flusher, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; - sync_server (flusher TAO_ENV_ARG_PARAMETER); + sync_server (flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong send_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int liveness_test_iterations = int(send_count); @@ -337,12 +337,12 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering, int depth = 0; for (int i = 0; i != liveness_test_iterations; ++i) { - oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Once the system has sent enough messages we don't @@ -360,13 +360,13 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering, "expected %u\n", i, receive_count, expected)); - sync_server (flusher TAO_ENV_ARG_PARAMETER); + sync_server (flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } if (depth++ == LIVENESS_MAX_DEPTH) { - sync_server (flusher TAO_ENV_ARG_PARAMETER); + sync_server (flusher ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); depth = 0; @@ -381,7 +381,7 @@ int run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; @@ -393,7 +393,7 @@ run_message_count (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -407,11 +407,11 @@ run_message_count (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -424,12 +424,12 @@ run_message_count (CORBA::ORB_ptr orb, while (1) { - oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong iteration_count = @@ -467,7 +467,7 @@ run_message_count (CORBA::ORB_ptr orb, run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -480,7 +480,7 @@ int run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -492,7 +492,7 @@ run_timeout (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -506,11 +506,11 @@ run_timeout (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -524,12 +524,12 @@ run_timeout (CORBA::ORB_ptr orb, ACE_Time_Value start = ACE_OS::gettimeofday (); while (1) { - oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; CORBA::ULong receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; @@ -567,7 +567,7 @@ run_timeout (CORBA::ORB_ptr orb, run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -581,7 +581,7 @@ int run_timeout_reactive (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -593,7 +593,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -607,11 +607,11 @@ run_timeout_reactive (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_receive_count != send_count) @@ -625,18 +625,18 @@ 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 TAO_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); send_count++; } while (1) { CORBA::ULong receive_count = - oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value sleep (0, 10000); - orb->run (sleep TAO_ENV_ARG_PARAMETER); + orb->run (sleep ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; @@ -674,7 +674,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) @@ -688,7 +688,7 @@ int run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; @@ -700,7 +700,7 @@ run_buffer_size (CORBA::ORB_ptr orb, int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (test_failed != 0) @@ -714,11 +714,11 @@ run_buffer_size (CORBA::ORB_ptr orb, CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { - sync_server (flusher.in () TAO_ENV_ARG_PARAMETER); + sync_server (flusher.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong initial_bytes_received = - oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (initial_bytes_received != bytes_sent) @@ -731,12 +731,12 @@ run_buffer_size (CORBA::ORB_ptr orb, while (1) { - oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER); + oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = - oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::ULong payload_delta = @@ -779,7 +779,7 @@ run_buffer_size (CORBA::ORB_ptr orb, run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (liveness_test_failed) diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 047b841e608..c13787ce522 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -45,15 +45,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -62,18 +62,18 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Oneway_Buffering_Admin_var admin = - Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (admin.in ())) @@ -92,11 +92,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl); Test::Oneway_Buffering_var oneway_buffering = - oneway_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (oneway_buffering.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_buffering.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -109,18 +109,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 60599eb6d4c..8f76444fb40 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -21,7 +21,7 @@ Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (int i = 0; i != 1; ++i) @@ -30,7 +30,7 @@ Client_Task::svc (void) "TAO (%P|%t) sending oneways...\n")); this->sender_->send_ready_message (this->us_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index a615bc0fa09..e33c63186f9 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -19,20 +19,20 @@ Receiver_i::~Receiver_i (void) CORBA::Long -Receiver_i::receive_call (TAO_ENV_SINGLE_ARG_DECL) +Receiver_i::receive_call (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping... \n")); - this->sender_->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return this->no_calls_++; } CORBA::Long -Receiver_i::get_call_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Receiver_i::get_call_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->iteration_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index bc133c6d926..3a8df239209 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -41,11 +41,11 @@ public: virtual ~Receiver_i (void); // = The skeleton methods - virtual CORBA::Long receive_call (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long receive_call (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long get_call_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 43f09655404..8ac983b0163 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 - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; @@ -25,7 +25,7 @@ Sender_i::active_objects (CORBA::Short no_threads void Sender_i::send_ready_message (Test::Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -38,14 +38,14 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver i < this->number_; ++i) { - receiver->receive_call (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver->receive_call (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Sender_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Sender_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) 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 b878806fb08..fffc668d58b 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -42,14 +42,14 @@ public: // = The skeleton methods virtual void active_objects (CORBA::Short ao - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_ready_message (Test::Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping (TAO_ENV_SINGLE_ARG_DECL) + virtual void ping (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp index 1338704fc0d..db7a0b5a63a 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -17,12 +17,12 @@ int Server_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // run the test for at most 60 seconds... ACE_Time_Value tv (60, 0); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index be485765c03..9d2b4cc90e8 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -40,11 +40,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -53,11 +53,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,11 +65,11 @@ main (int argc, char *argv[]) // Get the sender reference.. CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Sender_var sender = - Test::Sender::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); Test::Receiver_var receiver = - receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate poa manager - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_task (sender.in (), @@ -106,7 +106,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 TAO_ENV_ARG_PARAMETER); + sender->active_objects ((CORBA::Short) 2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1) @@ -124,7 +124,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Event Loop finished \n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 50d503f6736..2c3131b2cda 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -39,11 +39,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,11 +52,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -70,11 +70,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); Test::Sender_var sender = - sender_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (sender.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -87,7 +87,7 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Task server_task (orb.in (), @@ -101,10 +101,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 4a171233145..5abe5d8d0ff 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -22,7 +22,7 @@ class test_i : public POA_test { public: - void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -37,7 +37,7 @@ class test_i_with_reference_counting : public virtual PortableServer::RefCountSe public virtual POA_test { public: - void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,7 +53,7 @@ class Servant_Activator : public PortableServer::ServantActivator public: PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -62,14 +62,14 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &id, PortableServer::POA_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -94,7 +94,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_name = @@ -114,7 +114,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -122,24 +122,24 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (3); @@ -148,29 +148,29 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create servant activator. @@ -179,7 +179,7 @@ main (int argc, char **argv) // Set servant_activator as the servant_manager of child POA. child_poa->set_servant_manager (servant_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; { @@ -191,19 +191,19 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - test->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; child_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -216,19 +216,19 @@ main (int argc, char **argv) object = child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - test->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; child_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } 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 127ae92a099..7880507c3fa 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -24,10 +24,10 @@ class test_i : public POA_test { public: - void deactivate_self (TAO_ENV_SINGLE_ARG_DECL) + void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); PortableServer::POA_var poa_; @@ -35,17 +35,17 @@ public: }; PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->deactivate_object (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Exception flag @@ -54,7 +54,7 @@ test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { this->poa_->deactivate_object (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -79,7 +79,7 @@ test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL) void test_object_deactivation (PortableServer::POA_ptr poa, const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { test_i servant; int expected_exception_raised = 0; @@ -90,7 +90,7 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_TRY_EX (invalid_id) { poa->deactivate_object (invalid_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (invalid_id); } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -114,11 +114,11 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Reset flag @@ -127,7 +127,7 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_TRY_EX (double_deactivate) { poa->deactivate_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (double_deactivate); } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -149,7 +149,7 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant.poa_ = @@ -158,10 +158,10 @@ test_object_deactivation (PortableServer::POA_ptr poa, servant.id_ = id; test_var test = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - test->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER); + test->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_ASSERT dissappears in non-debug builds @@ -172,7 +172,7 @@ test_object_deactivation (PortableServer::POA_ptr poa, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -180,24 +180,24 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList empty_policies; @@ -205,32 +205,32 @@ main (int argc, char **argv) root_poa->create_POA ("child", poa_manager.in (), empty_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; obj = root_poa->create_reference ("IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_object_deactivation (root_poa.in (), id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; id = PortableServer::string_to_ObjectId ("good id"); test_object_deactivation (child_poa.in (), id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 4a9fec96cce..e13fb2f7333 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -30,7 +30,7 @@ public: { } - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -47,22 +47,22 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POA_out second_poa, PortableServer::POA_out third_poa, PortableServer::POA_out forth_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Policies for the new POAs CORBA::PolicyList policies (3); policies.length (3); policies[0] = root_poa->create_lifespan_policy (lifespan_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the firstPOA @@ -70,14 +70,14 @@ create_poas (PortableServer::POA_ptr root_poa, first_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the secondPOA @@ -85,14 +85,14 @@ create_poas (PortableServer::POA_ptr root_poa, second_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the thirdPOA @@ -100,14 +100,14 @@ create_poas (PortableServer::POA_ptr root_poa, third_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the forthPOA @@ -115,7 +115,7 @@ create_poas (PortableServer::POA_ptr root_poa, forth_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the new POAs over, so destroy the policies @@ -123,7 +123,7 @@ create_poas (PortableServer::POA_ptr root_poa, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -136,48 +136,48 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::POA_ptr third_poa, PortableServer::POA_ptr forth_poa, int perform_deactivation_test - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { test_i servant (root_poa); CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; root_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; obj = root_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::Servant servant_from_reference = root_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = root_poa->id_to_servant (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -189,49 +189,49 @@ test_poas (CORBA::ORB_ptr orb, } obj = root_poa->servant_to_reference (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); root_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { root_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant_from_reference = root_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); root_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -240,32 +240,32 @@ test_poas (CORBA::ORB_ptr orb, test_i servant (root_poa); PortableServer::ObjectId_var id = root_poa->activate_object (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = root_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = root_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); root_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -273,42 +273,42 @@ test_poas (CORBA::ORB_ptr orb, test_i servant (first_poa); CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; first_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; obj = first_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::Servant servant_from_reference = first_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = first_poa->id_to_servant (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -320,24 +320,24 @@ test_poas (CORBA::ORB_ptr orb, } first_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { first_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant_from_reference = first_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); first_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -346,32 +346,32 @@ test_poas (CORBA::ORB_ptr orb, test_i servant (first_poa); PortableServer::ObjectId_var id = first_poa->activate_object (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = first_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = first_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); first_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -379,42 +379,42 @@ test_poas (CORBA::ORB_ptr orb, test_i servant (second_poa); CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; second_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; obj = second_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::Servant servant_from_reference = second_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = second_poa->id_to_servant (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -426,49 +426,49 @@ test_poas (CORBA::ORB_ptr orb, } obj = second_poa->servant_to_reference (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); second_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { second_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant_from_reference = second_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); second_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -477,32 +477,32 @@ test_poas (CORBA::ORB_ptr orb, test_i servant (second_poa); PortableServer::ObjectId_var id = second_poa->activate_object (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = second_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = second_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); second_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -512,17 +512,17 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); @@ -532,27 +532,27 @@ test_poas (CORBA::ORB_ptr orb, third_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; obj = third_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::Servant servant_from_reference = third_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = third_poa->id_to_servant (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -564,26 +564,26 @@ test_poas (CORBA::ORB_ptr orb, } obj = third_poa->servant_to_reference (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_servant.in ()); @@ -592,24 +592,24 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_servant.in () == id.in ()); third_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { third_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant_from_reference = third_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); third_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -620,17 +620,17 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (), "IDL:test:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); @@ -640,27 +640,27 @@ test_poas (CORBA::ORB_ptr orb, forth_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; obj = forth_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; string = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::Servant servant_from_reference = forth_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = forth_poa->id_to_servant (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -677,17 +677,17 @@ test_poas (CORBA::ORB_ptr orb, { forth_poa->activate_object_with_id (id.in (), &servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; servant_from_reference = forth_poa->reference_to_servant (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); forth_poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -696,22 +696,22 @@ test_poas (CORBA::ORB_ptr orb, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters @@ -730,7 +730,7 @@ main (int argc, char **argv) second_poa.out (), third_poa.out (), forth_poa.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_poas (orb.in (), @@ -740,27 +740,27 @@ main (int argc, char **argv) third_poa.in (), forth_poa.in (), perform_deactivation_test - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; third_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; forth_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; create_poas (root_poa.in (), @@ -769,7 +769,7 @@ main (int argc, char **argv) second_poa.out (), third_poa.out (), forth_poa.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_poas (orb.in (), @@ -779,12 +779,12 @@ main (int argc, char **argv) third_poa.in (), forth_poa.in (), perform_deactivation_test - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index 1507a34bb43..c56375436b5 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -51,17 +51,17 @@ test_i::~test_i (void) { ACE_TRY_NEW_ENV { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this->other_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n")); poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,27 +82,27 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_i *servant1 = new test_i (0); @@ -110,7 +110,7 @@ main (int argc, char **argv) PortableServer::ObjectId_var id1 = root_poa->activate_object (servant1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Give ownership to POA. @@ -118,19 +118,19 @@ main (int argc, char **argv) PortableServer::ObjectId_var id2 = root_poa->activate_object (servant2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Give ownership to POA. servant2->_remove_ref (); root_poa->deactivate_object (id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 454cd4c1d5c..f63e474e459 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -25,7 +25,7 @@ class test_i : public POA_test public: test_i (ACE_Auto_Event &event); - void deactivate_self (TAO_ENV_SINGLE_ARG_DECL) + void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -38,19 +38,19 @@ test_i::test_i (ACE_Auto_Event &event) } void -test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n")); poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n")); @@ -114,14 +114,14 @@ Activator::svc (void) { PortableServer::ObjectId_var id = this->poa_->activate_object (this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { this->poa_->activate_object_with_id (this->id_, this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -157,7 +157,7 @@ Deactivator::svc (void) { ACE_TRY_NEW_ENV { - this->test_->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -173,7 +173,7 @@ Deactivator::svc (void) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -181,27 +181,27 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Auto_Event event1; @@ -210,10 +210,10 @@ main (int argc, char **argv) ACE_Auto_Event event2; test_i servant2 (event2); - test_var test_object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var test_object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_var test_object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var test_object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id1 = @@ -255,7 +255,7 @@ main (int argc, char **argv) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index 36800f959a1..a35208aa000 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -22,29 +22,29 @@ class test_i : public POA_test { public: - void destroy_poa (TAO_ENV_SINGLE_ARG_DECL) + void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; void -test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 0; poa->destroy (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -52,35 +52,35 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_i servant; - test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index ecee66581cc..41c06881c76 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -27,10 +27,10 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (TAO_ENV_SINGLE_ARG_DECL) + void method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: PortableServer::POA_var poa_; @@ -44,7 +44,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (TAO_ENV_SINGLE_ARG_DECL) +test_i::method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -62,16 +62,16 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Calling self from %t\n")); - test_var self = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - self->method (TAO_ENV_SINGLE_ARG_PARAMETER); + self->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -96,7 +96,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -118,22 +118,22 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the new POA. @@ -142,12 +142,12 @@ main (int argc, char **argv) policies[0] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the child POA. @@ -155,7 +155,7 @@ main (int argc, char **argv) root_poa->create_POA ("child", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policies @@ -163,20 +163,20 @@ main (int argc, char **argv) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_i servant1 (child_poa.in ()); test_i servant2 (child_poa.in ()); - test_var object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_var object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker1 (object1.in ()); @@ -195,7 +195,7 @@ main (int argc, char **argv) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index a6e778470ab..8b945a68c1b 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -21,7 +21,7 @@ class test_i : public POA_test { public: - void destroy_poa (TAO_ENV_SINGLE_ARG_DECL) + void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void test_poa (PortableServer::POA_ptr poa); @@ -36,14 +36,14 @@ test_i::test_poa (PortableServer::POA_ptr poa) } void -test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 1; this->poa_->destroy (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -51,33 +51,33 @@ PortableServer::POA_ptr init_orb (int argc, char **argv, const char *orb_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return root_poa._retn (); @@ -87,7 +87,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -95,18 +95,18 @@ main (int argc, init_orb (argc, argv, "first ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var second_poa = init_orb (argc, argv, "second ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_i servant; - test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int expected_exception_raised = 0; @@ -115,7 +115,7 @@ main (int argc, { servant.test_poa (first_poa.in ()); - test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (first_poa); } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) @@ -140,10 +140,10 @@ main (int argc, servant.test_poa (second_poa.in ()); - test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index e12c722c98f..af6bddcb277 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -48,7 +48,7 @@ Test_Any::opname (void) const } void -Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) +Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) { req->add_in_arg ("o1") <<= this->in_; req->add_inout_arg ("o2") <<= this->inout_; @@ -56,7 +56,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) req->set_return_type (CORBA::_tc_any); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -93,12 +93,12 @@ static const CORBA::TypeCode_ptr any_table [] = int Test_Any::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -270,14 +270,14 @@ Test_Any::reset_parameters (void) int Test_Any::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_any (this->in_, this->inout_, this->out_.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index 501d31336f8..f27f8be3c99 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -48,14 +48,14 @@ public: }; int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -70,7 +70,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 fe874758829..f8068a4ca54 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -33,7 +33,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Get_Opt get_opt (argc, argv, "dn:l:"); @@ -91,12 +91,12 @@ main (int argc, char *argv[]) { CORBA::Object_var obj = orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Param_Test_var param_test = Param_Test::_unchecked_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_Stub *stub = param_test->_stubobj (); stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0"); @@ -110,7 +110,7 @@ main (int argc, char *argv[]) "Cannot extract Param_Test (oh the horror)\n")); } CORBA::Boolean equiv = - param_test->_is_equivalent (o TAO_ENV_ARG_PARAMETER); + param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!equiv) { diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index 1b7edb51d8e..7bf7c6936b5 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -49,14 +49,14 @@ Test_Bounded_Array_Sequence::opname (void) const void Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_ArraySeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_ArraySeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_ArraySeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,7 +124,7 @@ Test_Bounded_Array_Sequence::reset_parameters (void) int Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref objref->test_bounded_array_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h index 2069c790f58..060454b6e71 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 a32c2d50f10..38bb0ed35ee 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -48,14 +48,14 @@ Test_Bounded_Long_Sequence::opname (void) const void Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Long_Seq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_Long_Seq *tmp; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Long_Seq (*tmp); @@ -77,7 +77,7 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -115,7 +115,7 @@ Test_Bounded_Long_Sequence::reset_parameters (void) int Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -123,7 +123,7 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_long_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index d7b49cd3b45..52e9fbdeb02 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 21836ba0f74..e6a6f205546 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -48,14 +48,14 @@ Test_Bounded_Short_Sequence::opname (void) const void Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_Short_Seq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_Short_Seq *tmp; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_Short_Seq (*tmp); @@ -77,7 +77,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED /*env*/) + ACE_ENV_ARG_DECL_NOT_USED /*env*/) { // ACE_UNUSED_ARG (objref); @@ -119,7 +119,7 @@ Test_Bounded_Short_Sequence::reset_parameters (void) int Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_short_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index f0b9b33944b..78f402b4f63 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 3df97b029d1..1ca7bb06806 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -48,7 +48,7 @@ Test_Bounded_String_Sequence::opname (void) const void Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Bounded_StrSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_StrSeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StrSeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -112,7 +112,7 @@ Test_Bounded_String_Sequence::reset_parameters (void) int Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -121,7 +121,7 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_strseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index be4e9061e40..31936d01fec 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 88bce95539d..538784a75a0 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -56,7 +56,7 @@ Test_Bounded_String::opname (void) const void Test_Bounded_String::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128); @@ -67,7 +67,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_short_string); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; char *tmp; @@ -75,13 +75,13 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= CORBA::Any::to_string (tmp, 128); this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_string (tmp, 128); this->out_ = CORBA::string_dup (tmp); @@ -89,7 +89,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req int Test_Bounded_String::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Bounded_String::reset_parameters (void) int Test_Bounded_String::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_string (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index 5d28250b598..f8024a686ff 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 3666187016c..f382a7badbe 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -51,14 +51,14 @@ Test_Bounded_Struct_Sequence::opname (void) const void Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Bounded_StructSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_StructSeq *tmp; @@ -66,13 +66,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_StructSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_StructSeq (*tmp); @@ -80,7 +80,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */ - TAO_ENV_ARG_DECL_NOT_USED /* env */) + ACE_ENV_ARG_DECL_NOT_USED /* env */) { Generator *gen = GENERATOR::instance (); // value generator @@ -117,7 +117,7 @@ Test_Bounded_Struct_Sequence::reset_parameters (void) int Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -126,7 +126,7 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index 5302176d981..e59ef86b43e 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 a0b9ae9d756..3c5c065af16 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -48,7 +48,7 @@ Test_Bounded_WString_Sequence::opname (void) const void Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Bounded_WStrSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const Param_Test::Bounded_WStrSeq *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Bounded_WStrSeq (*tmp); @@ -78,7 +78,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req int Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -111,7 +111,7 @@ Test_Bounded_WString_Sequence::reset_parameters (void) int Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -120,7 +120,7 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_wstrseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h index 038cc5f7be9..b1057f513f6 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 3100895a2b7..3d94454d818 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -56,7 +56,7 @@ Test_Bounded_WString::opname (void) const void Test_Bounded_WString::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128); req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128); @@ -67,7 +67,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_short_wstring); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::WChar *tmp; @@ -75,13 +75,13 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128); this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128); this->out_ = CORBA::wstring_dup (tmp); @@ -89,7 +89,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req int Test_Bounded_WString::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Bounded_WString::reset_parameters (void) int Test_Bounded_WString::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_bounded_wstring (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h index dbb2a29b882..ec0fb098b2e 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 0cb0f5589af..d63460e7eeb 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -46,7 +46,7 @@ Test_Big_Union::opname (void) const void Test_Big_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -54,7 +54,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Big_Union); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Big_Union *tmp; @@ -62,13 +62,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Big_Union (*tmp); @@ -76,12 +76,12 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req int Test_Big_Union::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -229,14 +229,14 @@ Test_Big_Union::reset_parameters (void) int Test_Big_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_big_union (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -286,7 +286,7 @@ Test_Big_Union::check_validity (void) break; case 1: { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Coffee_ptr in = this->in_.the_interface (); @@ -301,16 +301,16 @@ Test_Big_Union::check_validity (void) return 0; Coffee::Desc_var in_desc = - in->description (TAO_ENV_SINGLE_ARG_PARAMETER); + in->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var inout_desc = - inout->description (TAO_ENV_SINGLE_ARG_PARAMETER); + inout->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var out_desc = - out->description (TAO_ENV_SINGLE_ARG_PARAMETER); + out->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc_var ret_desc = - ret->description (TAO_ENV_SINGLE_ARG_PARAMETER); + ret->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (in_desc->name.in (), diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h index e66dbf4f6a6..f08e0eac9c3 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -38,14 +38,14 @@ public: }; int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -60,7 +60,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 3fe60d6cd70..c1edb32fbb2 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -65,10 +65,10 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.iterations (opt->loop_count ()); // Declare the Env - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize parameters for the test. int check = this->test_object_->init_parameters (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -98,7 +98,7 @@ Param_Test_Client<T>::run_sii_test (void) // make the call this->test_object_->run_sii_test (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // stop the timer. @@ -178,10 +178,10 @@ Param_Test_Client<T>::run_dii_test (void) this->results_.iterations (opt->loop_count ()); // Environment variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // initialize parameters for the test int check = this->test_object_->init_parameters (this->param_test_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check == -1) @@ -208,7 +208,7 @@ Param_Test_Client<T>::run_dii_test (void) ACE_TRY { req = this->param_test_->_request (opname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (opt->debug ()) @@ -219,7 +219,7 @@ Param_Test_Client<T>::run_dii_test (void) // Make the invocation, verify the result. this->test_object_->dii_req_invoke (req.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index d3d621880fe..730761cca34 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -52,7 +52,7 @@ Test_Complex_Any::opname (void) const void Test_Complex_Any::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -60,7 +60,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_any); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -68,13 +68,13 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -82,7 +82,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req int Test_Complex_Any::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->reset_parameters (); } @@ -168,14 +168,14 @@ Test_Complex_Any::reset_parameters (void) int Test_Complex_Any::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_complex_any (this->in_, this->inout_, this->out_.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index 0637a5647e9..8ad9e40be77 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 cac0b11e525..ba14469be30 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -61,7 +61,7 @@ int Driver::init (int argc, char **argv) { // environment to track exceptions - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // retrieve the instance of Options Options *opt = OPTIONS::instance (); @@ -76,7 +76,7 @@ Driver::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (argc, argv, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -89,7 +89,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 () TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -102,7 +102,7 @@ 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() TAO_ENV_ARG_PARAMETER); + this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -613,12 +613,12 @@ Driver::run (void) } // Get in a new environment variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (opt->shutdown ()) { - this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 5d2b8a77165..7eb9b210746 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -48,7 +48,7 @@ Test_Exception::opname (void) const void Test_Exception::dii_req_invoke (CORBA::Request_ptr req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -61,18 +61,18 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req req->exceptions ()->add (CORBA::TypeCode::_duplicate (Param_Test::_tc_Ooops)); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } @@ -132,7 +132,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req int Test_Exception::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -152,7 +152,7 @@ Test_Exception::reset_parameters (void) int Test_Exception::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -160,7 +160,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_exception (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Param_Test::Ooops, ex) diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index 5efa62b14f8..acc0f1c2cb0 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -31,14 +31,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -53,7 +53,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 b34cdbd5e46..02eb437af97 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -45,14 +45,14 @@ Test_Fixed_Array::opname (void) const void Test_Fixed_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_); req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_); req->set_return_type (Param_Test::_tc_Fixed_Array); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Array_forany forany; @@ -60,13 +60,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= forany; Param_Test::Fixed_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Array_forany out_any (this->out_); *arg3->value () >>= forany; @@ -75,7 +75,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req int Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -107,14 +107,14 @@ Test_Fixed_Array::reset_parameters (void) int Test_Fixed_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_array (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index 04c3744cb91..c064b8106fb 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 46e87cc5b66..669c7a9e7f8 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -44,14 +44,14 @@ Test_Fixed_Struct::opname (void) const void Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; req->add_out_arg ("s3") <<= this->out_; req->set_return_type (Param_Test::_tc_Fixed_Struct); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Fixed_Struct *tmp; @@ -59,13 +59,13 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req this->ret_ = *tmp; CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = *tmp; @@ -73,7 +73,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req int Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -106,14 +106,14 @@ Test_Fixed_Struct::reset_parameters (void) int Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_fixed_struct (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index c8c7a7f0c8d..b791bbe5e3e 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 6dd783bf1e5..ee238011542 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -47,7 +47,7 @@ Test_Multdim_Array::opname (void) const void Test_Multdim_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { 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 ()); @@ -55,7 +55,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Multdim_Array); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= forany; Param_Test::Multdim_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); @@ -78,7 +78,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req int Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -134,14 +134,14 @@ Test_Multdim_Array::reset_parameters (void) int Test_Multdim_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_multdim_array (this->in_.in (), this->inout_.inout (), this->out_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; } diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index e82d6dd0bd4..a6ab0243884 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 022c4fb538f..4b16cd9ff6a 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -48,14 +48,14 @@ Test_Nested_Struct::opname (void) const } void -Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) +Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); req->set_return_type (Param_Test::_tc_Nested_Struct); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Nested_Struct *tmp; @@ -63,13 +63,13 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) this->ret_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg2->value () >>= tmp; this->inout_ = new Param_Test::Nested_Struct (*tmp); CORBA::NamedValue_ptr arg3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *arg3->value () >>= tmp; this->out_ = new Param_Test::Nested_Struct (*tmp); @@ -77,7 +77,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) int Test_Nested_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -131,7 +131,7 @@ Test_Nested_Struct::reset_parameters (void) int Test_Nested_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -139,7 +139,7 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_nested_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 7fa958598b1..50a456bd479 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 128959dfed3..c629356d959 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -44,7 +44,7 @@ Test_ObjRef::opname (void) const void Test_ObjRef::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -52,7 +52,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req req->set_return_type (_tc_Coffee); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Coffee_ptr tmp; @@ -60,13 +60,13 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req this->ret_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Coffee::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Coffee::_duplicate (tmp); @@ -83,7 +83,7 @@ static const char *Coffee_Flavor [] = { int Test_ObjRef::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -95,7 +95,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref ACE_OS::strcpy (msg_str, "make_cofee"); // first get a Coffee object - this->in_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get some index into Coffee_Flavor []. @@ -104,7 +104,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 TAO_ENV_ARG_PARAMETER); // set the attribute for the in object + this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; this->inout_ = Coffee::_nil (); @@ -125,7 +125,7 @@ int Test_ObjRef::reset_parameters (void) { // Environemnt variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc desc; Generator *gen = GENERATOR::instance (); // value generator @@ -136,7 +136,7 @@ Test_ObjRef::reset_parameters (void) ACE_TRY { // set the attribute of the object - this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object + this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object ACE_TRY_CHECK; } ACE_CATCHANY @@ -155,7 +155,7 @@ Test_ObjRef::reset_parameters (void) int Test_ObjRef::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -164,7 +164,7 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_objref (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -183,7 +183,7 @@ CORBA::Boolean Test_ObjRef::check_validity (void) { // Environemnt variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -193,24 +193,24 @@ Test_ObjRef::check_validity (void) || CORBA::is_nil (this->ret_.in ())) return 0; Coffee::Desc_var in_desc = - this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *out = out_desc->name.in (); - Coffee::Desc_var ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char* ret = ret_desc->name.in (); @@ -241,7 +241,7 @@ void Test_ObjRef::print_values (void) { // Env. variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Coffee::Desc_var ret_desc; const char *in = 0; @@ -250,23 +250,23 @@ Test_ObjRef::print_values (void) ACE_TRY { Coffee::Desc_var in_desc = - this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; in = in_desc->name.in (); Coffee::Desc_var inout_desc = - this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; inout = inout_desc->name.in (); Coffee::Desc_var out_desc = - this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out = out_desc->name.in (); - ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER); + ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index fb03eb03ac2..023829729fc 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 4489417361f..35b97524b65 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -49,7 +49,7 @@ Test_Objref_Struct::opname (void) const void Test_Objref_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Objref_Struct); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Objref_Struct *tmp; @@ -65,13 +65,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Objref_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Objref_Struct (*tmp); @@ -79,7 +79,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req int Test_Objref_Struct::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -88,14 +88,14 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref // Set the long member. this->in_.x = gen->gen_long (); - this->in_.y = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Coffee::Desc d; d.name = gen->gen_string (); this->in_.y->description (d - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->inout_->x = 0; @@ -136,7 +136,7 @@ Test_Objref_Struct::reset_parameters (void) int Test_Objref_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -145,7 +145,7 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_objref_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -168,7 +168,7 @@ Test_Objref_Struct::check_validity (void) || this->in_.x != this->ret_->x) return 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -180,16 +180,16 @@ Test_Objref_Struct::check_validity (void) return 0; } - Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (s_in->name, s_out->name) != 0 @@ -231,21 +231,21 @@ Test_Objref_Struct::print_values (void) this->out_->x, this->ret_->x )); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index 2f517ef9b6f..8a2aaf06665 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 689e66c5c81..09e993346be 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -35,7 +35,7 @@ Coffee_i::~Coffee_i (void) // get attribute Coffee::Desc * -Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) +Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; @@ -46,7 +46,7 @@ Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/) // set attribute void Coffee_i::description (const Coffee::Desc &description - TAO_ENV_ARG_DECL_NOT_USED /*env*/) + ACE_ENV_ARG_DECL_NOT_USED /*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); @@ -75,7 +75,7 @@ CORBA::Short Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = (CORBA::Short) (s1 * 2); @@ -94,7 +94,7 @@ CORBA::ULongLong Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; @@ -109,7 +109,7 @@ char * Param_Test_i::test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -128,7 +128,7 @@ char * Param_Test_i::test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); @@ -147,7 +147,7 @@ CORBA::WChar * Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -170,7 +170,7 @@ CORBA::WChar * Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); @@ -191,7 +191,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; @@ -205,7 +205,7 @@ Param_Test::Long_Seq * Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, Param_Test::Long_Seq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Long_Seq @@ -223,7 +223,7 @@ Param_Test::Short_Seq * Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1, Param_Test::Short_Seq & s2, Param_Test::Short_Seq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Short_Seq @@ -241,7 +241,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq @@ -259,7 +259,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq @@ -277,7 +277,7 @@ Param_Test::StrSeq * Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::StrSeq &s2, Param_Test::StrSeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -313,7 +313,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -334,7 +334,7 @@ Param_Test::WStrSeq * Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1, Param_Test::WStrSeq &ws2, Param_Test::WStrSeq_out ws3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -355,7 +355,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -377,7 +377,7 @@ Param_Test::StructSeq * Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, Param_Test::StructSeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -400,7 +400,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq @@ -419,7 +419,7 @@ Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, Param_Test::PathSpec_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec @@ -452,7 +452,7 @@ Param_Test::ArraySeq * Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::ArraySeq &s2, Param_Test::ArraySeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -475,7 +475,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_ArraySeq @@ -493,7 +493,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix @@ -536,7 +536,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix @@ -579,7 +579,7 @@ Param_Test::AnySeq * Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, Param_Test::AnySeq &s2, Param_Test::AnySeq_out s3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -603,7 +603,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -625,7 +625,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -647,7 +647,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -668,7 +668,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -687,10 +687,10 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr -Param_Test_i::make_coffee (TAO_ENV_SINGLE_ARG_DECL) +Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); } // test for object references @@ -698,21 +698,21 @@ Coffee_ptr Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); ACE_TRY { - Coffee_var myobj = obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (o2)) CORBA::release (o2); CORBA::Boolean equiv = myobj->_is_equivalent (o1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (equiv) @@ -747,7 +747,7 @@ CORBA::TypeCode_ptr Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, CORBA::TypeCode_out t3 - TAO_ENV_ARG_DECL_NOT_USED/*env*/) + ACE_ENV_ARG_DECL_NOT_USED/*env*/) ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others @@ -762,7 +762,7 @@ CORBA::Any * Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any *ret; @@ -784,7 +784,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, if (TAO_debug_level > 0) { CORBA::TypeCode_var tc = a1.type (); - int kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -929,7 +929,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -945,7 +945,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -960,7 +960,7 @@ CORBA::ULong Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, CORBA::ULong_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)) { @@ -981,7 +981,7 @@ Param_Test_i::test_exception (CORBA::ULong s1, // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's // conversion of such an exception to UNKNOWN. - this->throw_badboy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 0; @@ -991,7 +991,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); @@ -1004,7 +1004,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u2 = u1; @@ -1016,7 +1016,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1)); @@ -1029,7 +1029,7 @@ CORBA::Any* Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); @@ -1042,7 +1042,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Multdim_Array_slice *ret; @@ -1054,14 +1054,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, } void -Param_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } void -Param_Test_i::throw_badboy (TAO_ENV_SINGLE_ARG_DECL) +Param_Test_i::throw_badboy (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW (Param_Test::BadBoy ()); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 31ba05dedf1..219f2b2c1ea 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -31,12 +31,12 @@ public: // =methods for the attribute - virtual Coffee::Desc * description (TAO_ENV_SINGLE_ARG_DECL) + virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute virtual void description (const Coffee::Desc &description - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // set attribute @@ -63,42 +63,42 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for shorts virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unsigned long long virtual char *test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded strings virtual char *test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded wstrings @@ -106,7 +106,7 @@ public: test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed structures @@ -115,97 +115,97 @@ public: const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, Param_Test::Long_Seq_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Short_Seq * test_short_sequence ( const Param_Test::Short_Seq & s1, Param_Test::Short_Seq & s2, Param_Test::Short_Seq_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StrSeq * test_strseq ( const Param_Test::StrSeq & s1, Param_Test::StrSeq & s2, Param_Test::StrSeq_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::WStrSeq * test_wstrseq ( const Param_Test::WStrSeq & ws1, Param_Test::WStrSeq & ws2, Param_Test::WStrSeq_out ws3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::AnySeq * test_anyseq ( const Param_Test::AnySeq & s1, Param_Test::AnySeq & s2, Param_Test::AnySeq_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... @@ -213,7 +213,7 @@ public: test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for variable structs @@ -221,7 +221,7 @@ public: test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for nested structs @@ -229,7 +229,7 @@ public: test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, Param_Test::Recursive_Struct_out rs3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for recursive structs @@ -237,11 +237,11 @@ public: test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr - make_coffee (TAO_ENV_SINGLE_ARG_DECL) + make_coffee (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // make a coffee object @@ -249,7 +249,7 @@ public: test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for object references @@ -257,7 +257,7 @@ public: test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, CORBA::TypeCode_out o3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for typecodes @@ -265,7 +265,7 @@ public: test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for Anys @@ -273,7 +273,7 @@ public: test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed size arrays @@ -281,14 +281,14 @@ public: test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Param_Test::Ooops)); @@ -296,28 +296,28 @@ public: test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, Param_Test::Big_Union_out u3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any* test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test for multi dimensional arrays @@ -325,10 +325,10 @@ public: test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , Param_Test::Multdim_Array_out - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -339,7 +339,7 @@ private: Coffee_i obj_; // the coffee object reference we maintain - void throw_badboy (TAO_ENV_SINGLE_ARG_DECL); + void throw_badboy (ACE_ENV_SINGLE_ARG_DECL); // Called by test_exception. This will avoid the compiler // warning that test_exception is throwing an exception // not in its THROW_SPEC, but still test TAO's diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index cbe8190640b..1e4f34d3f65 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -48,7 +48,7 @@ Test_Recursive_Struct::opname (void) const void Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Recursive_Struct); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Struct *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Struct (*tmp); @@ -78,7 +78,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req int Test_Recursive_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -117,7 +117,7 @@ Test_Recursive_Struct::reset_parameters (void) int Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -126,7 +126,7 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_recursive_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h index 9837523a401..18175cb53bd 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -36,14 +36,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -59,7 +59,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 1c9ec710040..b868c76ee54 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -48,7 +48,7 @@ Test_Recursive_Union::opname (void) const void Test_Recursive_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Recursive_Union); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Union *tmp; @@ -64,13 +64,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Recursive_Union (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Recursive_Union (*tmp); @@ -78,7 +78,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req int Test_Recursive_Union::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -119,7 +119,7 @@ Test_Recursive_Union::reset_parameters (void) int Test_Recursive_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_recursive_union (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h index 33870fecbf6..5ebeaac1dd7 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -36,14 +36,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -59,7 +59,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 23ce8f75a3e..481e82837e3 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -103,7 +103,7 @@ Results::print_stats (void) void Results::print_exception (const char * /* call_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { //ACE_PRINT_EXCEPTION (call_name); } diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h index 81225cd2d01..e4cf1941a26 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -39,7 +39,7 @@ public: // prints the time stats void print_exception (const char *call_name - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // print the exception void start_timer (void); diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 2fa7b83009e..d148bb4fa2d 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -61,12 +61,12 @@ main (int argc, char *argv[]) PortableServer::POA_var oa_ptr; Param_Test_i *param_test = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get @@ -75,7 +75,7 @@ main (int argc, char *argv[]) // Get the Root POA temp = orb_ptr->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (temp.in())) @@ -83,21 +83,21 @@ main (int argc, char *argv[]) "(%P|%t) Unable to get root poa reference.\n"), 1); - oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER); + oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + oa_ptr->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); policies.length (2); policies[0] = oa_ptr->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); policies[1] = oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // We use a different POA, otherwise the user would have to // change the object key each time it invokes the server. @@ -105,7 +105,7 @@ main (int argc, char *argv[]) oa_ptr->create_POA ("child_poa", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse remaining command line and verify parameters. @@ -124,19 +124,19 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("param_test"); good_poa->activate_object_with_id (id.in (), param_test - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to // stdout. Someone will take that string and give it to a // client. Then release the object. - temp = good_poa->id_to_reference (id.in () TAO_ENV_ARG_PARAMETER); + temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb_ptr->object_to_string (temp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -149,20 +149,20 @@ main (int argc, char *argv[]) // Make the POAs controlled by this manager active - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; good_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; oa_ptr->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index 6c906cbbadd..68d02b1db10 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -44,7 +44,7 @@ Test_Short::opname (void) const void Test_Short::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -52,25 +52,25 @@ Test_Short::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_short); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int Test_Short::init_parameters (Param_Test_ptr /*objref*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -90,14 +90,14 @@ Test_Short::reset_parameters (void) int Test_Short::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_short (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index 2304e0f2671..5157b673c74 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 555e42c38c8..6c05b360cbb 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -46,7 +46,7 @@ Test_Small_Union::opname (void) const void Test_Small_Union::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -54,7 +54,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Small_Union); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Small_Union *tmp; @@ -62,13 +62,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = *tmp; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Small_Union (*tmp); @@ -76,12 +76,12 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req int Test_Small_Union::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -130,14 +130,14 @@ Test_Small_Union::reset_parameters (void) int Test_Small_Union::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_small_union (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h index 0e6124c80e3..bea055565b4 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 23972a2ef3f..44b891b6ac9 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -44,7 +44,7 @@ Test_TypeCode::opname (void) const void Test_TypeCode::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -52,7 +52,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_TypeCode); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_ptr tmp; @@ -60,13 +60,13 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::TypeCode::_duplicate (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::TypeCode::_duplicate (tmp); @@ -74,7 +74,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req int Test_TypeCode::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { static CORBA::TypeCode_ptr tc_table [] = { @@ -116,11 +116,11 @@ Test_TypeCode::reset_parameters (void) int Test_TypeCode::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - this->init_parameters (objref TAO_ENV_ARG_PARAMETER); + this->init_parameters (objref ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_out out (this->out_); @@ -128,7 +128,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_typecode (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -146,22 +146,22 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref CORBA::Boolean Test_TypeCode::check_validity (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Boolean one, two, three; one = this->in_.in ()->equal (this->inout_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; two = this->in_.in ()->equal (this->out_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; three = this->in_.in ()->equal (this->ret_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (one && two && three) diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index 4181f902805..bb369324d6e 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 a05bc294abc..e755c773a7f 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -52,7 +52,7 @@ Test_AnySeq::opname (void) const void Test_AnySeq::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -60,7 +60,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_AnySeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::AnySeq* tmp; @@ -68,13 +68,13 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::AnySeq (*tmp); @@ -82,7 +82,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req int Test_AnySeq::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Generator *gen = GENERATOR::instance (); // value generator @@ -124,7 +124,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref ACE_TRY { // get access to a Coffee Object - Coffee_var cobj = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // insert the coffee object into the Any @@ -198,7 +198,7 @@ Test_AnySeq::reset_parameters (void) int Test_AnySeq::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -207,7 +207,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_anyseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index d7087b969b0..7b1efefb875 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 a4534a5129a..c662ac224c4 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -47,7 +47,7 @@ Test_Array_Sequence::opname (void) const void Test_Array_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -55,7 +55,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_ArraySeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::ArraySeq *tmp; @@ -63,13 +63,13 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::ArraySeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::ArraySeq (*tmp); @@ -77,7 +77,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req int Test_Array_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -126,7 +126,7 @@ Test_Array_Sequence::reset_parameters (void) int Test_Array_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -135,7 +135,7 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_array_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h index 855c2c27565..ce888926d2e 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 eeae63f57e9..d14d272722c 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -48,7 +48,7 @@ Test_Long_Sequence::opname (void) const void Test_Long_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Long_Seq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Long_Seq *tmp; @@ -64,13 +64,13 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = Param_Test::Long_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = Param_Test::Long_Seq (*tmp); @@ -78,7 +78,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req int Test_Long_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -108,7 +108,7 @@ Test_Long_Sequence::reset_parameters (void) int Test_Long_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -117,7 +117,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_long_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index 133930584f0..a73f8d4adfe 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 99a8e7f0761..15e8b9a6cba 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -58,7 +58,7 @@ Test_ObjRef_Sequence::opname (void) const void Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -66,7 +66,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Coffee_Mix); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Coffee_Mix *tmp; @@ -74,13 +74,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Coffee_Mix (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Coffee_Mix (*tmp); @@ -88,7 +88,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req int Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -106,7 +106,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref { // generate some arbitrary string to be filled into the ith location in // the sequence - this->in_[i] = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // select a Coffee flavor at random @@ -117,7 +117,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref Coffee_ptr tmp = this->in_[i]; tmp->description (desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -144,7 +144,7 @@ Test_ObjRef_Sequence::reset_parameters (void) int Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -153,7 +153,7 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_coffe_mix (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -171,23 +171,23 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref CORBA::Boolean Test_ObjRef_Sequence::check_validity (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->compare (this->in_, this->inout_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, this->out_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->compare (this->in_, this->ret_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 1; @@ -233,7 +233,7 @@ Test_ObjRef_Sequence::print_values (void) CORBA::Boolean Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, const Param_Test::Coffee_Mix &s2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -261,12 +261,12 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, return 0; } - Coffee::Desc_var desc1 = vs1->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var n1 = desc1->name.in (); - Coffee::Desc_var desc2 = vs2->description (TAO_ENV_SINGLE_ARG_PARAMETER); + Coffee::Desc_var desc2 = vs2->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var n2 = desc2->name.in (); diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index 1955fbfdeb1..f087101b08b 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,13 +57,13 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1, const Param_Test::Coffee_Mix &s2 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // 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 b6d97bb5af4..519c5687ee6 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -48,7 +48,7 @@ Test_Short_Sequence::opname (void) const void Test_Short_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Short_Seq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Short_Seq *tmp; @@ -64,13 +64,13 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::Short_Seq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Short_Seq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Short_Seq (*tmp); @@ -78,7 +78,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req int Test_Short_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -110,7 +110,7 @@ Test_Short_Sequence::reset_parameters (void) int Test_Short_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -119,7 +119,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_short_sequence (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index f15ccbe0bb2..5f433fba4e0 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 a7bb6108914..8d85803ab37 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -48,7 +48,7 @@ Test_String_Sequence::opname (void) const void Test_String_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_StrSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StrSeq *tmp; @@ -64,13 +64,13 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StrSeq (*tmp); @@ -78,7 +78,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req int Test_String_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const char *choiceList[] = { @@ -114,7 +114,7 @@ Test_String_Sequence::reset_parameters (void) int Test_String_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -123,7 +123,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_strseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 5193a92a113..78f9c6f60f2 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 ff695b3e18e..f378c212fa6 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -56,7 +56,7 @@ Test_Unbounded_String::opname (void) const void Test_Unbounded_String::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -67,7 +67,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_string); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *tmp; @@ -75,13 +75,13 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::string_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::string_dup (tmp); @@ -89,7 +89,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req int Test_Unbounded_String::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -126,7 +126,7 @@ Test_Unbounded_String::reset_parameters (void) int Test_Unbounded_String::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -135,7 +135,7 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_unbounded_string (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index 12b02c4af4a..ed721972028 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 be2efce2d3d..cbf69675ddc 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -49,7 +49,7 @@ Test_Struct_Sequence::opname (void) const void Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_StructSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StructSeq *tmp; @@ -65,13 +65,13 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::StructSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::StructSeq (*tmp); @@ -79,7 +79,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Struct_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -111,7 +111,7 @@ Test_Struct_Sequence::reset_parameters (void) int Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -120,7 +120,7 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -256,7 +256,7 @@ Test_Unbounded_Struct_Sequence::opname (void) const void Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -264,7 +264,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_PathSpec); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::PathSpec *tmp; @@ -272,13 +272,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::PathSpec (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::PathSpec (*tmp); @@ -286,7 +286,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req int Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -319,13 +319,13 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) int Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Param_Test::PathSpec_out out (this->out_.out ()); this->ret_ = objref->test_unbounded_struct_sequence (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 546d1e95854..00ce057526d 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. protected: @@ -98,14 +98,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -120,7 +120,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 15852c15044..d5494df60fa 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -48,7 +48,7 @@ Test_WString_Sequence::opname (void) const void Test_WString_Sequence::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.in (); req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -56,7 +56,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_WStrSeq); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::WStrSeq *tmp; @@ -64,13 +64,13 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req this->ret_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::WStrSeq (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::WStrSeq (*tmp); @@ -78,7 +78,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req int Test_WString_Sequence::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -109,7 +109,7 @@ Test_WString_Sequence::reset_parameters (void) int Test_WString_Sequence::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -118,7 +118,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_wstrseq (this->in_.in (), this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index 9e45909609d..c691018765d 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -58,7 +58,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 255e49b96b0..bfb398c2259 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -56,7 +56,7 @@ Test_Unbounded_WString::opname (void) const void Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -67,7 +67,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_wstring); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::WChar *tmp; @@ -75,13 +75,13 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req this->ret_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::wstring_dup (tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = CORBA::wstring_dup (tmp); @@ -89,7 +89,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req int Test_Unbounded_WString::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -125,7 +125,7 @@ Test_Unbounded_WString::reset_parameters (void) int Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -134,7 +134,7 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_unbounded_wstring (this->in_, this->inout_, str_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h index 5f53c7e707a..04497648c11 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: // print all the values void dii_req_invoke (CORBA::Request * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // 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 05360195cb3..e491c76d9f2 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -40,7 +40,7 @@ Test_ULongLong::opname (void) const void Test_ULongLong::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_; @@ -48,25 +48,25 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req req->set_return_type (CORBA::_tc_ulonglong); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; req->return_value () >>= this->ret_; CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= this->inout_; CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= this->out_; } int Test_ULongLong::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -86,14 +86,14 @@ Test_ULongLong::reset_parameters (void) int Test_ULongLong::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_ulonglong (this->in_, this->inout_, this->out_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index 6deae313e01..db9e1fa86a4 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -31,14 +31,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -53,7 +53,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 7a429a50a7e..997600b7479 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -46,7 +46,7 @@ Test_Var_Array::opname (void) const void Test_Var_Array::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_); req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_); @@ -54,7 +54,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Var_Array); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Array_forany forany; @@ -63,13 +63,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= forany; Param_Test::Var_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= forany; this->out_ = Param_Test::Var_Array_dup (forany.in ()); @@ -77,7 +77,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req int Test_Var_Array::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -104,7 +104,7 @@ Test_Var_Array::reset_parameters (void) int Test_Var_Array::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -112,7 +112,7 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_var_array (this->in_, this->inout_, out_arr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 3bf6bff5e66..07d33162104 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -34,14 +34,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -56,7 +56,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // 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 849d80bcb16..ff644037acc 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -49,7 +49,7 @@ Test_Var_Struct::opname (void) const void Test_Var_Struct::dii_req_invoke (CORBA::Request *req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_; req->add_inout_arg ("s2") <<= this->inout_.in (); @@ -57,7 +57,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Var_Struct); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Var_Struct *tmp; @@ -65,13 +65,13 @@ 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 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = new Param_Test::Var_Struct (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new Param_Test::Var_Struct (*tmp); @@ -79,7 +79,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req int Test_Var_Struct::init_parameters (Param_Test_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -134,7 +134,7 @@ Test_Var_Struct::reset_parameters (void) int Test_Var_Struct::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -142,7 +142,7 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref this->ret_ = objref->test_var_struct (this->in_, this->inout_.inout (), out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index f7a4228bdef..aab34fe5247 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -35,14 +35,14 @@ public: // dtor int run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // run the SII test const char *opname (void) const; // return operation name int init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // set values for parameters int reset_parameters (void); @@ -57,7 +57,7 @@ public: void print_values (void); // print all the values - void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED); + void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED); // invoke DII request with appropriate exception handling. private: diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 549033856ae..6992cafb9d7 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -63,7 +63,7 @@ private: CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, CORBA::PolicyCurrent_ptr policy_current - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: CORBA::ORB_var orb_; @@ -82,7 +82,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var test = - Test::_unchecked_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_unchecked_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -145,7 +145,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, CORBA::PolicyCurrent_ptr policy_current - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -206,7 +206,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, policy = this->orb_->create_policy (policy_type, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE; @@ -227,7 +227,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, CORBA::Object_var tmp = this->test_->_set_policy_overrides (policy_list, override_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (operation == ADD_CURRENT_POLICY @@ -235,7 +235,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, { policy_current->set_policy_overrides (policy_list, override_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -244,24 +244,24 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, // || operation == SET_CURRENT_POLICY) policy_manager->set_policy_overrides (policy_list, override_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (operation == SAVE_CURRENT_POLICIES) { CORBA::PolicyTypeSeq types; policies = - policy_current->get_policy_overrides (types TAO_ENV_ARG_PARAMETER); + policy_current->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (operation == SAVE_MANAGER_POLICIES) { CORBA::PolicyTypeSeq types; policies = - policy_manager->get_policy_overrides (types TAO_ENV_ARG_PARAMETER); + policy_manager->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (operation == RESTORE_CURRENT_POLICIES) @@ -270,7 +270,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, { policy_current->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -280,7 +280,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, { policy_manager->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -307,20 +307,20 @@ Manipulation::svc (void) #endif CORBA::Object_var object = this->orb_->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -331,7 +331,7 @@ Manipulation::svc (void) policies, policy_manager.in (), policy_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 2e59b25ca5c..ac66f70dc63 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -17,7 +17,7 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -25,7 +25,7 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,6 +68,6 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; info->add_client_request_interceptor (interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h index 3892d9abcf3..37f8fc4e360 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h @@ -35,11 +35,11 @@ public: Client_ORBInitializer (int interceptor_type); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 c1cabcaa2d4..908f0505579 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -19,7 +19,7 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -27,7 +27,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -70,6 +70,6 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; info->add_server_request_interceptor (interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h index 98b9b2ec535..9d0def3d62e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h @@ -35,11 +35,11 @@ public: Server_ORBInitializer (int interceptor_type); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 769632b1f33..cf45cfb9fb4 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -50,7 +50,7 @@ parse_args (int argc, char *argv[]) void run_test (Test_Interceptors::Secure_Vault_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int i = 0; const char user[] = "root"; @@ -68,7 +68,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->ready (TAO_ENV_SINGLE_ARG_PARAMETER); + server->ready (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Grab timestamp again. @@ -96,7 +96,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->authenticate (user TAO_ENV_ARG_PARAMETER); + server->authenticate (user ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Grab timestamp again. @@ -134,7 +134,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server server->update_records (id, record - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -191,23 +191,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -223,10 +223,10 @@ 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 () TAO_ENV_ARG_PARAMETER); + run_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp index 9c9eb160a09..b90b7642047 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp @@ -33,14 +33,14 @@ Vault_Client_Request_Interceptor::_remove_ref (void) } char * -Vault_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -48,7 +48,7 @@ Vault_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Vault_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -57,12 +57,12 @@ Vault_Client_Request_Interceptor::send_poll ( void Vault_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -81,14 +81,14 @@ 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 TAO_ENV_ARG_PARAMETER); + ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -103,17 +103,17 @@ Vault_Client_Request_Interceptor::send_request ( void Vault_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -123,7 +123,7 @@ Vault_Client_Request_Interceptor::receive_reply ( void Vault_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -133,21 +133,21 @@ Vault_Client_Request_Interceptor::receive_other ( void Vault_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -182,14 +182,14 @@ Vault_Server_Request_Interceptor::_remove_ref (void) } char * -Vault_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -197,7 +197,7 @@ Vault_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Vault_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -207,19 +207,19 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts ( void Vault_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -233,7 +233,7 @@ Vault_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -248,17 +248,17 @@ Vault_Server_Request_Interceptor::receive_request ( void Vault_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -268,7 +268,7 @@ Vault_Server_Request_Interceptor::send_reply ( void Vault_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -278,7 +278,7 @@ Vault_Server_Request_Interceptor::send_exception ( void Vault_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -313,7 +313,7 @@ Vault_Client_Request_Context_Interceptor::_remove_ref (void) char * Vault_Client_Request_Context_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -321,7 +321,7 @@ Vault_Client_Request_Context_Interceptor::name ( void Vault_Client_Request_Context_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -329,7 +329,7 @@ Vault_Client_Request_Context_Interceptor::destroy ( void Vault_Client_Request_Context_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -338,7 +338,7 @@ Vault_Client_Request_Context_Interceptor::send_poll ( void Vault_Client_Request_Context_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -360,14 +360,14 @@ 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 TAO_ENV_ARG_PARAMETER); + ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Vault_Client_Request_Context_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -377,7 +377,7 @@ Vault_Client_Request_Context_Interceptor::receive_other ( void Vault_Client_Request_Context_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -386,21 +386,21 @@ Vault_Client_Request_Context_Interceptor::receive_reply ( void Vault_Client_Request_Context_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -436,7 +436,7 @@ Vault_Server_Request_Context_Interceptor::_remove_ref (void) char * Vault_Server_Request_Context_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -444,7 +444,7 @@ Vault_Server_Request_Context_Interceptor::name ( void Vault_Server_Request_Context_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -452,7 +452,7 @@ Vault_Server_Request_Context_Interceptor::destroy ( void Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -462,14 +462,14 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Context_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -482,7 +482,7 @@ Vault_Server_Request_Context_Interceptor::receive_request ( void Vault_Server_Request_Context_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -491,7 +491,7 @@ Vault_Server_Request_Context_Interceptor::send_reply ( void Vault_Server_Request_Context_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -500,7 +500,7 @@ Vault_Server_Request_Context_Interceptor::send_exception ( void Vault_Server_Request_Context_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -534,7 +534,7 @@ Vault_Client_Request_Dynamic_Interceptor::_remove_ref (void) char * Vault_Client_Request_Dynamic_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -542,7 +542,7 @@ Vault_Client_Request_Dynamic_Interceptor::name ( void Vault_Client_Request_Dynamic_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -550,7 +550,7 @@ Vault_Client_Request_Dynamic_Interceptor::destroy ( void Vault_Client_Request_Dynamic_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -559,18 +559,18 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll ( void Vault_Client_Request_Dynamic_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *user; @@ -582,7 +582,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -597,18 +597,18 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( void Vault_Client_Request_Dynamic_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -618,7 +618,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( { CORBA::Long result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -628,7 +628,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( void Vault_Client_Request_Dynamic_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -638,21 +638,21 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other ( void Vault_Client_Request_Dynamic_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -688,7 +688,7 @@ Vault_Server_Request_Dynamic_Interceptor::_remove_ref (void) char * Vault_Server_Request_Dynamic_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -696,7 +696,7 @@ Vault_Server_Request_Dynamic_Interceptor::name ( void Vault_Server_Request_Dynamic_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -704,18 +704,18 @@ Vault_Server_Request_Dynamic_Interceptor::destroy ( void Vault_Server_Request_Dynamic_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *user; @@ -727,7 +727,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -742,7 +742,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( void Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -752,17 +752,17 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Dynamic_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -771,7 +771,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -781,7 +781,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( void Vault_Server_Request_Dynamic_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -790,7 +790,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception ( void Vault_Server_Request_Dynamic_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -823,7 +823,7 @@ Vault_Client_Request_NOOP_Interceptor::_remove_ref (void) } char * -Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -831,7 +831,7 @@ Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Vault_Client_Request_NOOP_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -839,7 +839,7 @@ Vault_Client_Request_NOOP_Interceptor::destroy ( void Vault_Client_Request_NOOP_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -848,7 +848,7 @@ Vault_Client_Request_NOOP_Interceptor::send_poll ( void Vault_Client_Request_NOOP_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -858,7 +858,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request ( void Vault_Client_Request_NOOP_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -868,7 +868,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_other ( void Vault_Client_Request_NOOP_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -877,21 +877,21 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply ( void Vault_Client_Request_NOOP_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -926,7 +926,7 @@ Vault_Server_Request_NOOP_Interceptor::_remove_ref (void) } char * -Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -934,7 +934,7 @@ Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Vault_Server_Request_NOOP_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -942,7 +942,7 @@ Vault_Server_Request_NOOP_Interceptor::destroy ( void Vault_Server_Request_NOOP_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -951,7 +951,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request ( void Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -961,7 +961,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( void Vault_Server_Request_NOOP_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -970,7 +970,7 @@ Vault_Server_Request_NOOP_Interceptor::send_reply ( void Vault_Server_Request_NOOP_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -979,7 +979,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception ( void Vault_Server_Request_NOOP_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h index 7a077f925d3..05206a6e7d4 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h @@ -35,33 +35,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -86,35 +86,35 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -139,33 +139,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -190,35 +190,35 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -244,33 +244,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -295,35 +295,35 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -349,33 +349,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -400,35 +400,35 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 d3849370316..9d8610b2857 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -53,18 +53,18 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,35 +72,35 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (test_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -120,12 +120,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 748820c893b..8eed5c1c096 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -12,7 +12,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) // ctor CORBA::Short -Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Secure_Vault_i::ready (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; @@ -20,7 +20,7 @@ Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Secure_Vault_i::authenticate (const char * user - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)) { @@ -32,15 +32,15 @@ Secure_Vault_i::authenticate (const char * user CORBA::Long Secure_Vault_i::update_records (CORBA::Long, const Test_Interceptors::Secure_Vault::Record & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Secure_Vault_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Secure_Vault_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 07891acfc20..1e91333a22d 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -27,21 +27,21 @@ public: Secure_Vault_i (CORBA::ORB_ptr orb); // ctor - virtual CORBA::Short ready (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short ready (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void authenticate (const char * user - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index bd736641a5a..eff774840ce 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$") void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -21,7 +21,7 @@ Echo_Client_ORBInitializer::pre_init ( void Echo_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,7 +38,7 @@ Echo_Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 01d8ed5223e..744e300ebe7 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -35,11 +35,11 @@ class Echo_Client_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 3951c2527a6..d97e189d466 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$") void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -21,7 +21,7 @@ Echo_Server_ORBInitializer::pre_init ( void Echo_Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,7 +38,7 @@ Echo_Server_ORBInitializer::post_init ( server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index 1c087f32c26..a3c63880e02 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -35,11 +35,11 @@ class Echo_Server_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index 0e927949c71..ba7cc997692 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -39,15 +39,15 @@ parse_args (int argc, char *argv[]) void run_test (Test_Interceptors::Visual_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - server->normal (10 TAO_ENV_ARG_PARAMETER); + server->normal (10 ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, two - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -57,7 +57,7 @@ run_test (Test_Interceptors::Visual_ptr server ACE_TRY { - server->user (TAO_ENV_SINGLE_ARG_PARAMETER); + server->user (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test_Interceptors::Silly, userex) @@ -69,7 +69,7 @@ run_test (Test_Interceptors::Visual_ptr server ACE_TRY_EX (SYS) { - server->system (TAO_ENV_SINGLE_ARG_PARAMETER); + server->system (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,22 +94,22 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -120,9 +120,9 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () TAO_ENV_ARG_PARAMETER); + run_test (server.in () ACE_ENV_ARG_PARAMETER); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp index c3292620654..254109d8afe 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp @@ -35,14 +35,14 @@ Echo_Client_Request_Interceptor::_remove_ref (void) } char * -Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -50,7 +50,7 @@ Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -60,12 +60,12 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -76,7 +76,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -93,12 +93,12 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -110,11 +110,11 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -125,7 +125,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -140,7 +140,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param1, param2, result; @@ -149,7 +149,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -165,12 +165,12 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -180,7 +180,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::String_var exception_id = - ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -212,14 +212,14 @@ Echo_Server_Request_Interceptor::_remove_ref (void) } char * -Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -227,7 +227,7 @@ Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -236,12 +236,12 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -251,7 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -266,7 +266,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -277,11 +277,11 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -291,7 +291,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -306,7 +306,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param1, param2, result = 0; @@ -315,7 +315,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -331,12 +331,12 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -346,12 +346,12 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -362,7 +362,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h index 68777008e86..e0f6bfa90ab 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h @@ -33,29 +33,29 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -63,12 +63,12 @@ public: )); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -94,16 +94,16 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -111,22 +111,22 @@ public: )); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 0b5756e38d1..62696682ac3 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -51,15 +51,15 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -68,14 +68,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -85,21 +85,21 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -117,12 +117,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 64c80dd0a86..d760688fb6d 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -12,7 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -21,7 +21,7 @@ Visual_i::normal (CORBA::Long arg CORBA::Long Visual_i::calculate (CORBA::Long one, CORBA::Long two - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) +Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -37,7 +37,7 @@ Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) +Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,7 +45,7 @@ Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index 1c679a55b7c..f31756fb10a 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -28,22 +28,22 @@ public: // ctor void normal (CORBA::Long arg - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long calculate ( CORBA::Long one, CORBA::Long two - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 8ff1de5e5be..8f147a4df0c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -15,7 +15,7 @@ ACE_RCSID (ForwardRequest, void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,13 +23,13 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::StringSeq_var args = info->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var forward_str; @@ -59,7 +59,7 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h index 015848c743c..ceacb35a97f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h @@ -46,11 +46,11 @@ class Client_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 104ad3d7681..43c3962fa02 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -19,14 +19,14 @@ Client_Request_Interceptor::Client_Request_Interceptor ( char * Client_Request_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); } void -Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -34,14 +34,14 @@ Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { ++this->request_count_; CORBA::Boolean response_expected = - ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -58,18 +58,18 @@ Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Object_var forward = this->orb_->string_to_object (this->forward_str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var forward_str = this->orb_->object_to_string (forward.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -87,7 +87,7 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -95,7 +95,7 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -103,7 +103,7 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -112,17 +112,17 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ReplyStatus reply_status = - ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected // A one-way or asynchronous request. @@ -136,7 +136,7 @@ Client_Request_Interceptor::receive_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (forward.in ())) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index 4696ede0d9c..37994c74c0e 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -66,37 +66,37 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 9fed7eb387f..4a5ff2b8045 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -18,7 +18,7 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -26,7 +26,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; @@ -43,7 +43,7 @@ Server_ORBInitializer::post_init ( this->server_interceptor_ = interceptor; info->add_server_request_interceptor (interceptor - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index 7b0320caf55..865ab8044be 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h @@ -52,11 +52,11 @@ public: Server_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 650431f5134..fb67917c81b 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -21,7 +21,7 @@ void Server_Request_Interceptor::forward_references ( CORBA::Object_ptr obj1, CORBA::Object_ptr obj2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) @@ -36,14 +36,14 @@ Server_Request_Interceptor::forward_references ( } char * -Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); @@ -53,14 +53,14 @@ Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { this->request_count_++; CORBA::Boolean response_expected = - ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -93,12 +93,12 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -135,7 +135,7 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -143,7 +143,7 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -152,12 +152,12 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -169,7 +169,7 @@ Server_Request_Interceptor::send_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (forward.in ())) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 189fa3d6ee0..cd4fb27371b 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -69,7 +69,7 @@ public: /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, CORBA::Object_ptr obj2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -82,38 +82,38 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 42c9f336a0f..c9fc64b3ecd 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -50,7 +50,7 @@ main (int argc, char *argv[]) { int status = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -64,14 +64,14 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) @@ -81,11 +81,11 @@ main (int argc, char *argv[]) // IOR occurs during the various interceptions executed during // this test. CORBA::Object_var object = - orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ForwardRequestTest::test_var server = - ForwardRequestTest::test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -112,7 +112,7 @@ main (int argc, char *argv[]) if (i > 1) old_number = number; - number = server->number (TAO_ENV_SINGLE_ARG_PARAMETER); + number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -141,7 +141,7 @@ main (int argc, char *argv[]) } } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 3a4e7f1fa21..f4aaaa548ec 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -56,7 +56,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_ORBInitializer *temp_initializer = 0; @@ -67,15 +67,15 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -84,11 +84,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) @@ -103,21 +103,21 @@ main (int argc, char *argv[]) root_poa->create_POA ("first POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj1 = first_poa->servant_to_reference (&servant1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior1 = - orb->object_to_string (obj1.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -131,28 +131,28 @@ main (int argc, char *argv[]) root_poa->create_POA ("second POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = second_poa->activate_object (&servant2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj2 = second_poa->servant_to_reference (&servant2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior2 = - orb->object_to_string (obj2.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 2: <%s>\n", ior2.in ())); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Set the forward references in the server request interceptor. @@ -161,7 +161,7 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( - server_interceptor.in () TAO_ENV_ARG_PARAMETER); + server_interceptor.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (interceptor.in ())) @@ -172,7 +172,7 @@ main (int argc, char *argv[]) interceptor->forward_references (obj1.in (), obj2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Write each IOR to a file. @@ -199,13 +199,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index abe34922f30..adafe5be28d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -18,18 +18,18 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 04ef8b96d8e..51c142c2de3 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,11 +37,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index 2adf3bbcd2e..100d5176c81 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -9,14 +9,14 @@ ACE_RCSID (IORInterceptor, char * FOO_ClientRequestInterceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_ClientRequestInterceptor"); } void -FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -24,7 +24,7 @@ FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void FOO_ClientRequestInterceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -33,7 +33,7 @@ FOO_ClientRequestInterceptor::send_request ( // profile. IOP::TaggedComponent_var component = ri->get_effective_component (FOO::COMPONENT_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The correct tagged component appears to exist. Display the @@ -61,7 +61,7 @@ FOO_ClientRequestInterceptor::send_request ( void FOO_ClientRequestInterceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -69,7 +69,7 @@ FOO_ClientRequestInterceptor::send_poll ( void FOO_ClientRequestInterceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -77,7 +77,7 @@ FOO_ClientRequestInterceptor::receive_reply ( void FOO_ClientRequestInterceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -86,7 +86,7 @@ FOO_ClientRequestInterceptor::receive_exception ( void FOO_ClientRequestInterceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 6dd2180d9de..02c4319ddcb 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -58,37 +58,37 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 1986211dd64..2ca470b3152 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor, void FOO_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -18,7 +18,7 @@ FOO_Client_ORBInitializer::pre_init ( void FOO_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr foo; @@ -35,6 +35,6 @@ FOO_Client_ORBInitializer::post_init ( foo; info->add_client_request_interceptor (interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index afec7a1b51e..01a5cc2bce6 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -57,13 +57,13 @@ public: /// The pre-initialization hook. virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 95a8d090193..e5b12846c51 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -8,14 +8,14 @@ ACE_RCSID (IORInterceptor, "$Id$") char * -FOO_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_IORInterceptor"); } void -FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,7 +23,7 @@ FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void FOO_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // According to the Portable Interceptors specification, @@ -32,7 +32,7 @@ FOO_IORInterceptor::establish_components ( // does the right thing, and ignores any IOR interceptors that throw // an exception. - CORBA::String_var name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the length of the string plus one for the NULL terminator. @@ -53,7 +53,7 @@ FOO_IORInterceptor::establish_components ( // Add the tagged component to all profiles. info->add_ior_component (FOO_Component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -65,7 +65,7 @@ FOO_IORInterceptor::establish_components ( void FOO_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -75,7 +75,7 @@ void FOO_IORInterceptor::adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId , PortableInterceptor::AdapterState - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -85,7 +85,7 @@ void FOO_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index df51ed69ddb..2fa2027a6fc 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -56,28 +56,28 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. virtual void establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -85,7 +85,7 @@ public: virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 3781f73dd95..1860310c092 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor, void FOO_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -18,7 +18,7 @@ FOO_IORInterceptor_ORBInitializer::pre_init ( void FOO_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36,6 +36,6 @@ FOO_IORInterceptor_ORBInitializer::post_init ( foo; info->add_ior_interceptor (ior_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 7b1dc666c0f..ed0a8ce161f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -57,13 +57,13 @@ public: /// The pre-initialization hook. virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index f0177e0af19..b0869bed3f1 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -51,23 +51,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FOO::test_var server = - FOO::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -78,7 +78,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index e981076e18b..4d9e10f5536 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -53,7 +53,7 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -61,16 +61,16 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -79,10 +79,10 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) test_i server_impl (orb.in ()); - obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; FOO::test_var server = FOO::test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -104,7 +104,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -123,7 +123,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index 1bcd569d623..ecdb6b3560f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -12,10 +12,10 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 2309de5d64b..a712ff5c8d7 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,7 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index 76c69b76129..c555b2f2c53 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -12,7 +12,7 @@ PortableInterceptor::SlotId slot_id = 2093843221; void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -20,10 +20,10 @@ ServerORBInitializer::pre_init ( void ServerORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ::slot_id = info->allocate_slot_id (TAO_ENV_SINGLE_ARG_PARAMETER); + ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_ptr tmp; @@ -39,6 +39,6 @@ ServerORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; info->add_server_request_interceptor (interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h index b8b1ed06ec4..9057ba80593 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h @@ -65,13 +65,13 @@ public: /// The pre-initialization hook. virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 4f7354e6843..6a1fe16b448 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -15,14 +15,14 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -30,12 +30,12 @@ ServerRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) @@ -50,7 +50,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( ACE_TRY { - ri->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER); + ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -76,7 +76,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -85,11 +85,11 @@ ServerRequestInterceptor::receive_request ( void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) @@ -102,7 +102,7 @@ ServerRequestInterceptor::send_reply ( // Retrieve the data stored in the RSC. This data should be // different from the original data stored into the RSC by the // receive_request_service_contexts() interception point. - data = ri->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER); + data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -144,7 +144,7 @@ ServerRequestInterceptor::send_reply ( void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -153,7 +153,7 @@ ServerRequestInterceptor::send_exception ( void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 d261109238e..16cf93d8d9b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -58,38 +58,38 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 5a88a5bb0cc..9baf7a31f3c 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 0 @@ -51,23 +51,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PICurrentTest::test_var server = - PICurrentTest::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -78,10 +78,10 @@ main (int argc, char *argv[]) 1); } - server->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER); + server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 12ba83e873a..4414b4966cc 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -54,22 +54,22 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -78,20 +78,20 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; - obj = orb->resolve_initial_references ("PICurrent" TAO_ENV_ARG_PARAMETER); + obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) @@ -103,12 +103,12 @@ main (int argc, char *argv[]) ::slot_id, orb.in ()); - obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PICurrentTest::test_var server = PICurrentTest::test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -118,7 +118,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ())); @@ -137,7 +137,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index dbea3421c8e..061948b2659 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -20,7 +20,7 @@ test_i::~test_i (void) } void -test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL) +test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -39,7 +39,7 @@ test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL) // receive_request_service_contexts() interception point, and // then copied into the TSC current. retrieved_any = - this->current_->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER); + this->current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -88,7 +88,7 @@ test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY_EX (foo) { - this->current_->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER); + this->current_->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (foo); } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -113,11 +113,11 @@ test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server is shutting down.\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index ed0f81b6c2d..e217cdd75b1 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -38,11 +38,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: 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 642c66c8913..afd5699b21d 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -15,7 +15,7 @@ ACE_RCSID (Request_Interceptor_Flow, void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,7 +23,7 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -43,7 +43,7 @@ Client_ORBInitializer::post_init ( ci; info->add_client_request_interceptor (ci_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (ci, @@ -58,7 +58,7 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (ci, @@ -73,6 +73,6 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } 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 a9e20a2c950..c328fb96d85 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h @@ -48,11 +48,11 @@ class Client_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 5cb7411e4ee..953f4bad296 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 @@ -15,13 +15,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name) void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri TAO_ENV_ARG_PARAMETER); + this->client_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -35,7 +35,7 @@ Client_Request_Interceptor::send_request ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -75,12 +75,12 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = - this->client_side_test (ri TAO_ENV_ARG_PARAMETER); + this->client_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -96,12 +96,12 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = - this->client_side_test (ri TAO_ENV_ARG_PARAMETER); + this->client_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -117,7 +117,7 @@ Client_Request_Interceptor::receive_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -155,13 +155,13 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri TAO_ENV_ARG_PARAMETER); + this->client_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -177,7 +177,7 @@ Client_Request_Interceptor::receive_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -192,12 +192,12 @@ Client_Request_Interceptor::receive_exception ( switch (scenario) { case 4: - exception = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + exception = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tc = exception->type (); - id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) @@ -239,13 +239,13 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = - this->client_side_test (ri TAO_ENV_ARG_PARAMETER); + this->client_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -261,9 +261,9 @@ Client_Request_Interceptor::receive_other ( CORBA::Boolean Client_Request_Interceptor::client_side_test ( PortableInterceptor::ClientRequestInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return ACE_OS_String::strcmp (op.in (), "client_test") == 0 ? 1 : 0; 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 c7fe08002a5..84b3468b286 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 @@ -62,29 +62,29 @@ public: //@{ virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} @@ -95,7 +95,7 @@ private: // otherwise. CORBA::Boolean client_side_test ( PortableInterceptor::ClientRequestInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; 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 8ceb71036e4..7b48928c7d2 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -15,14 +15,14 @@ Request_Interceptor::Request_Interceptor (const char *name) char * Request_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); } void -Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL) +Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index 2c8a682d1ca..e8b1bf43936 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -59,10 +59,10 @@ public: */ //@{ /// Return the name of this Requestinterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp index 1e5ef57fd73..f51c123c7dd 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -15,7 +15,7 @@ ACE_RCSID (Request_Interceptor_Flow, void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,7 +23,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -43,7 +43,7 @@ Server_ORBInitializer::post_init ( si; info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (si, @@ -58,7 +58,7 @@ Server_ORBInitializer::post_init ( si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (si, @@ -73,6 +73,6 @@ Server_ORBInitializer::post_init ( si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } 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 1ffba6a3dca..bfb4ada10b3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h @@ -48,11 +48,11 @@ class Server_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 625574cfa47..e11ceee2f35 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 @@ -17,13 +17,13 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri TAO_ENV_ARG_PARAMETER); + this->server_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -64,13 +64,13 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri TAO_ENV_ARG_PARAMETER); + this->server_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -84,12 +84,12 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean server_side = - this->server_side_test (ri TAO_ENV_ARG_PARAMETER); + this->server_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -105,7 +105,7 @@ Server_Request_Interceptor::send_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -143,13 +143,13 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri TAO_ENV_ARG_PARAMETER); + this->server_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -165,7 +165,7 @@ Server_Request_Interceptor::send_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -180,12 +180,12 @@ Server_Request_Interceptor::send_exception ( switch (scenario) { case 4: - exception = ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER); + exception = ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tc = exception->type (); - id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) @@ -227,13 +227,13 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = - this->server_side_test (ri TAO_ENV_ARG_PARAMETER); + this->server_side_test (ri ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -249,9 +249,9 @@ Server_Request_Interceptor::send_other ( CORBA::Boolean Server_Request_Interceptor::server_side_test ( PortableInterceptor::ServerRequestInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return ACE_OS_String::strcmp (op.in (), "server_test") == 0 ? 1 : 0; 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 1e6c84778ad..9a62c6546e1 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 @@ -63,30 +63,30 @@ public: //@{ virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} @@ -97,7 +97,7 @@ private: /// otherwise. CORBA::Boolean server_side_test ( PortableInterceptor::ServerRequestInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 872b042472e..114837bcb26 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } void -client_test (Test_ptr server TAO_ENV_ARG_DECL) +client_test (Test_ptr server ACE_ENV_ARG_DECL) { // Currently, there are only four scenarios for the client side // tests. @@ -56,7 +56,7 @@ client_test (Test_ptr server TAO_ENV_ARG_DECL) ACE_TRY { - server->client_test (i TAO_ENV_ARG_PARAMETER); + server->client_test (i ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -89,7 +89,7 @@ client_test (Test_ptr server TAO_ENV_ARG_DECL) } void -server_test (Test_ptr server TAO_ENV_ARG_DECL) +server_test (Test_ptr server ACE_ENV_ARG_DECL) { // Currently, there are only four scenarios for the server side // tests. @@ -104,7 +104,7 @@ server_test (Test_ptr server TAO_ENV_ARG_DECL) ACE_TRY { - server->server_test (i TAO_ENV_ARG_PARAMETER); + server->server_test (i ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -139,7 +139,7 @@ server_test (Test_ptr server TAO_ENV_ARG_DECL) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -152,24 +152,24 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -180,13 +180,13 @@ main (int argc, char *argv[]) 1); } - ::client_test (server.in () TAO_ENV_ARG_PARAMETER); + ::client_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ::server_test (server.in () TAO_ENV_ARG_PARAMETER); + ::server_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 5f1a1aac394..b5c19048de3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -43,7 +43,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_ORBInitializer *temp_initializer = 0; @@ -54,15 +54,15 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -71,11 +71,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) @@ -83,18 +83,18 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", ior.in ())); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Write IOR to a file. @@ -109,13 +109,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 682c1eec724..34463868f5a 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -13,7 +13,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::client_test (Test::TestScenario scenario - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -35,7 +35,7 @@ test_i::client_test (Test::TestScenario scenario void test_i::server_test (Test::TestScenario scenario - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -56,11 +56,11 @@ test_i::server_test (Test::TestScenario scenario } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } 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 d0a480c43d7..2d55095fe78 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -34,20 +34,20 @@ public: /// The client-side test operation. virtual void client_test (Test::TestScenario scenario - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); /// The server-side test operation. virtual void server_test (Test::TestScenario scenario - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index 4244d28739f..b4732ce7376 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -15,7 +15,7 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,12 +23,12 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -44,7 +44,7 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } 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 4f0a2b8b6bd..855d3ace6e9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h @@ -35,11 +35,11 @@ public: Client_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 6546f4ef6f9..e0c859a8680 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -15,7 +15,7 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,7 +23,7 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor = @@ -39,7 +39,7 @@ Server_ORBInitializer::post_init ( server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } 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 a957f112d7d..075f4bdefaa 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h @@ -35,11 +35,11 @@ public: Server_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 72d0eff0e95..61a34eea641 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -37,22 +37,22 @@ parse_args (int argc, char *argv[]) void run_test (Test_Interceptors::Visual_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - server->normal (10 TAO_ENV_ARG_PARAMETER); + server->normal (10 ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (TAO_ENV_SINGLE_ARG_PARAMETER); + server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (TAO_ENV_SINGLE_ARG_PARAMETER); + server->user (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test_Interceptors::Silly, userex) @@ -64,7 +64,7 @@ run_test (Test_Interceptors::Visual_ptr server ACE_TRY_EX (SYS) { - server->system (TAO_ENV_SINGLE_ARG_PARAMETER); + server->system (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -89,22 +89,22 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -115,10 +115,10 @@ main (int argc, char *argv[]) 1); } - run_test (server.in () TAO_ENV_ARG_PARAMETER); + run_test (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp index e370378705d..94318e09bdc 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp @@ -37,14 +37,14 @@ Echo_Client_Request_Interceptor::_remove_ref (void) } char * -Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -52,7 +52,7 @@ Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -61,7 +61,7 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -71,18 +71,18 @@ Echo_Client_Request_Interceptor::send_request ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -105,12 +105,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 TAO_ENV_ARG_PARAMETER); + ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -130,7 +130,7 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -139,18 +139,18 @@ Echo_Client_Request_Interceptor::receive_reply ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -163,7 +163,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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -181,7 +181,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 TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -200,7 +200,7 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -212,7 +212,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -222,18 +222,18 @@ Echo_Client_Request_Interceptor::receive_exception ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -246,7 +246,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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -264,7 +264,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 TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -304,14 +304,14 @@ Echo_Server_Request_Interceptor::_remove_ref (void) } char * -Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -319,12 +319,12 @@ Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -341,7 +341,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -371,7 +371,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 TAO_ENV_ARG_PARAMETER); + ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -379,7 +379,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -389,11 +389,11 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -403,7 +403,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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -422,7 +422,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 TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = ACE_reinterpret_cast (const char *, @@ -442,12 +442,12 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -457,7 +457,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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -476,7 +476,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 TAO_ENV_ARG_PARAMETER); + ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = ACE_reinterpret_cast (const char *, @@ -496,7 +496,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h index a9fad3502c8..c1c21678dae 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h @@ -38,33 +38,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -96,35 +96,35 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 ee954a1172c..15de32386a0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -50,16 +50,16 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -68,14 +68,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -85,21 +85,21 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -119,12 +119,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY 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 3d6d031610a..503c7a5b423 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -14,21 +14,21 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } void -Visual_i::nothing (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) +Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) +Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,9 @@ Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h index 7fc612e7210..5a6df58c457 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -29,20 +29,20 @@ public: Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index d6082da0e8a..fc505726700 100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -24,21 +24,21 @@ main (int argc, char *argv[]) QApplication app (argc, argv); TAO_QtResource_Factory::set_context (&app); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client client (orb.in (), app); - client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER); + client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creates the Qt widgets - client.create_widgets (TAO_ENV_SINGLE_ARG_PARAMETER); + client.create_widgets (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This may look a bit suspect, but Qt wants the manager widget @@ -75,7 +75,7 @@ Client::~Client (void) void Client::parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *ior = "file://test.ior"; @@ -98,11 +98,11 @@ Client::parse_args (int argc, } CORBA::Object_var object = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->server_ = - LCD_Display::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + LCD_Display::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(this->server_.in ())) @@ -113,7 +113,7 @@ Client::parse_args (int argc, } void -Client::create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Client::create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Ewsize the box this->box_.resize (200,120); diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index bbd8a4dc4ba..36da68ab1f9 100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -38,13 +38,13 @@ public: ~Client (void); //Dtor.. - void create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Adds the callbacks to the GUI underneath..... void show (void); void parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); QVBox box_; // A box widget.. diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 1094e5f4c37..09732412920 100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -63,15 +63,15 @@ main (int argc, char *argv[]) QApplication app (argc, argv); TAO_QtResource_Factory::set_context (&app); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -80,11 +80,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Qt stuff.. @@ -92,7 +92,7 @@ main (int argc, char *argv[]) LCD_Display_imp display_impl (orb.in ()); LCD_Display_var server = - display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the LCD after the QVbox is created. @@ -115,7 +115,7 @@ main (int argc, char *argv[]) // End of QT specific stuff.. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -133,7 +133,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We choose to run the main Qt event loop.. diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 6277525c83a..8b5bae8c705 100755 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -17,7 +17,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb) } void -LCD_Display_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +LCD_Display_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -28,7 +28,7 @@ LCD_Display_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void LCD_Display_imp::send_val (CORBA::Long val - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 e13be721eba..46eeb94d323 100755 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -41,11 +41,11 @@ public: // ctor - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void send_val (CORBA::Long val - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); signals: diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 13ad05417f5..badd76f3043 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -41,22 +41,22 @@ parse_args (int argc, char *argv[]) CORBA::Short get_server_priority (Test_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the Priority Model Policy from the stub. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow down to correct type. RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Make sure that we have the SERVER_DECLARED priority model. RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (priority_model != RTCORBA::SERVER_DECLARED) ACE_ERROR_RETURN ((LM_ERROR, @@ -65,20 +65,20 @@ get_server_priority (Test_ptr server -1); // Return the server priority. - return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); } void invocation_exception_test (Test_ptr obj, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // Invoke method on test object. obj->test_method (1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This next line of code should not run because an exception @@ -115,7 +115,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -128,42 +128,42 @@ main (int argc, char *argv[]) // Get the RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the RTCurrent. object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test object 1 (with CLIENT_PROPAGATED priority model). object = orb->string_to_object (ior1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var client_propagated_obj = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test object 2 (with SERVER_DECLARED priority model). object = orb->string_to_object (ior2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server_declared_obj = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test: Attempt to set priority bands that do not match server @@ -183,7 +183,7 @@ main (int argc, char *argv[]) policies.length (1); policies[0] = rt_orb->create_priority_banded_connection_policy (false_bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set false bands at the object level. Note that a new object @@ -191,24 +191,24 @@ main (int argc, char *argv[]) object = client_propagated_obj->_set_policy_overrides (policies, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client_propagated_obj = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoking on this object with false bands should produce an // exception. invocation_exception_test (client_propagated_obj.in (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the correct bands from the <server_declared_obj>. policies[0] = server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityBandedConnectionPolicy_var bands_policy = @@ -222,12 +222,12 @@ main (int argc, char *argv[]) object = client_propagated_obj->_set_policy_overrides (policies, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Overwrite existing <client_propagated_obj>. client_propagated_obj = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test: Attempt invocation on <client_propagated_obj> with @@ -243,14 +243,14 @@ main (int argc, char *argv[]) // Reset the current thread's priority. current->the_priority (client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoking on this object with an invalid client thread // priority should produce an exception. invocation_exception_test (client_propagated_obj.in (), client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test: Make invocations on the <client_propagated_obj>. @@ -268,13 +268,13 @@ main (int argc, char *argv[]) // Reset the current thread's priority. current->the_priority (client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke test method on server. client_propagated_obj->test_method (1, // CLIENT_PROPAGATED client_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -286,17 +286,17 @@ main (int argc, char *argv[]) // Get the <server_priority> from the stub. CORBA::Short server_priority = get_server_priority (server_declared_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke test method on server. server_declared_obj->test_method (0, // SERVER_DECLARED server_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Testing over. Shut down Server ORB. - server_declared_obj->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_declared_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index c2b2660d8fc..ea801e29409 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -12,14 +12,14 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb, RTCORBA::PriorityBands &bands - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_method (CORBA::Boolean client_propagated, CORBA::Short priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -30,7 +30,7 @@ private: Test_i::Test_i (CORBA::ORB_ptr orb, RTCORBA::PriorityBands &bands - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : orb_ (CORBA::ORB::_duplicate (orb)), bands_ (bands), rt_current_ () @@ -38,24 +38,24 @@ Test_i::Test_i (CORBA::ORB_ptr orb, // We resolve and store the RT Current for later use. CORBA::Object_var obj = this->orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->rt_current_ = RTCORBA::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Test_i::test_method (CORBA::Boolean client_propagated, CORBA::Short client_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the upcall thread's priority. CORBA::Short server_priority = - this->rt_current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Check which policy we are dealing with. @@ -116,11 +116,11 @@ Test_i::test_method (CORBA::Boolean client_propagated, } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -233,24 +233,24 @@ create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register servant with the POA. PortableServer::ObjectId_var id; id = poa->activate_object (server_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create object reference. CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print ior to the file. @@ -276,7 +276,7 @@ void object_activation_exception_test (RTPortableServer::POA_ptr poa, Test_i *server_impl, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -284,7 +284,7 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa, PortableServer::ObjectId_var id = poa->activate_object_with_priority (server_impl, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This next line of code should not run because an exception @@ -311,7 +311,7 @@ void poa_creation_exception_test (PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr manager, CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -320,7 +320,7 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa, root_poa->create_POA ("Child_POA", manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This next line of code should not run because an exception @@ -357,7 +357,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -370,27 +370,27 @@ main (int argc, char *argv[]) // Get the RTORB. CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the RootPOA. object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA Manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain priority bands to be used in this test from the file @@ -436,7 +436,7 @@ main (int argc, char *argv[]) allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test: Attempt to create a POA with priority bands that do not @@ -455,13 +455,13 @@ main (int argc, char *argv[]) // Create a bands policy. poa_policy_list[0] = rt_orb->create_priority_banded_connection_policy (false_bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[1] = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a POA with invalid policies. Should throw an @@ -469,7 +469,7 @@ main (int argc, char *argv[]) poa_creation_exception_test (root_poa.in (), poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Two policies for the next POA. @@ -479,13 +479,13 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[1] = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED priority model, with lanes @@ -494,7 +494,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("client_propagated_poa", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Three policies for the next POA. @@ -508,19 +508,19 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, poa_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a bands policy. poa_policy_list[1] = rt_orb->create_priority_banded_connection_policy (bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a thread-pool policy. poa_policy_list[2] = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA with SERVER_DECLARED priority model, with bands @@ -529,7 +529,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("server_declared_poa", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test: Attempt to register an object with priority that @@ -538,7 +538,7 @@ 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 () TAO_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activation with incorrect priority should fail. @@ -546,19 +546,19 @@ main (int argc, char *argv[]) object_activation_exception_test (rt_server_declared_poa.in (), 0, wrong_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create first servant and register with <client_propagated_poa>. Test_i server_impl (orb.in (), bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = create_object (client_propagated_poa.in (), orb.in (), &server_impl, ior_output_file1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; @@ -566,27 +566,27 @@ main (int argc, char *argv[]) // Create second servant and register with <server_declared_poa>. Test_i server_impl2 (orb.in (), bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = create_object (server_declared_poa.in (), orb.in (), &server_impl2, ior_output_file2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; // Activate POA manager. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run ORB. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy ORB. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index 5a57d02a41b..d57bc36ba7f 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -15,7 +15,7 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,12 +23,12 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -44,7 +44,7 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index 4f0a2b8b6bd..855d3ace6e9 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -35,11 +35,11 @@ public: Client_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 28c586f5857..9d893ebf504 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -54,23 +54,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -85,11 +85,11 @@ main (int argc, char *argv[]) // PriorityModelPolicy. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (priority_policy.in ())) @@ -98,7 +98,7 @@ main (int argc, char *argv[]) 1); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority_model != RTCORBA::CLIENT_PROPAGATED) @@ -110,18 +110,18 @@ main (int argc, char *argv[]) // Make several invocation, changing the priority of this thread // for each. object = - orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping *pm = @@ -145,11 +145,11 @@ main (int argc, char *argv[]) for (int i = 0; i < 3; ++i) { - current->the_priority (desired_priority TAO_ENV_ARG_PARAMETER); + current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (desired_priority != priority) @@ -159,14 +159,14 @@ main (int argc, char *argv[]) 1); - server->test_method (priority TAO_ENV_ARG_PARAMETER); + server->test_method (priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; desired_priority++; } // Shut down Server ORB. - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::DATA_CONVERSION, ex) diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index a8b90cfe9b2..5f25dd80e4a 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -33,14 +33,14 @@ Client_Request_Interceptor::_remove_ref (void) } char * -Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -48,7 +48,7 @@ Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing @@ -57,7 +57,7 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -67,7 +67,7 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,7 +76,7 @@ Client_Request_Interceptor::receive_reply ( // 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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -95,7 +95,7 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -104,7 +104,7 @@ Client_Request_Interceptor::receive_other ( void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -114,18 +114,18 @@ Client_Request_Interceptor::receive_exception ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -139,6 +139,6 @@ 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 TAO_ENV_ARG_PARAMETER); + ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 9bd520664ae..3bea78ef097 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -39,33 +39,33 @@ public: virtual void _remove_ref (void); // Decrement the reference count. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 21af1d36fdb..a22a3155703 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -17,10 +17,10 @@ public: // = The Test methods. void test_method (CORBA::Short priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -35,25 +35,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (obj.in ())) ACE_THROW (CORBA::INTERNAL ()); CORBA::Short servant_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Print out the info. @@ -69,10 +69,10 @@ Test_i::test_method (CORBA::Short priority } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -119,18 +119,18 @@ main (int argc, char *argv[]) // parse arguments and get all the references (ORB, // RootPOA, RTORB, RTCurrent, POAManager). CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -139,20 +139,20 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = - orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED PriorityModelPolicy, @@ -162,30 +162,30 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server = child_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -204,21 +204,21 @@ main (int argc, char *argv[]) // Get the initial priority of the current thread. CORBA::Short initial_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run ORB Event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); // Get the final priority of the current thread. CORBA::Short final_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (final_thread_priority != initial_thread_priority) diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index e4375ae41cd..22f26d9a51a 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -64,11 +64,11 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) void exception_test (Test_ptr server, const char *msg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::INV_POLICY, ex) @@ -94,7 +94,7 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -103,20 +103,20 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // PolicyManager. object = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (policy_manager.in (), "PolicyManager") == -1) @@ -124,27 +124,27 @@ main (int argc, char *argv[]) // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return 1; // Test object 1 (ClientProtocolPolicy set on server). - object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return 1; // Test object 2 (no client-exposed ClientProtocolPolicy). - object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return 1; @@ -155,7 +155,7 @@ main (int argc, char *argv[]) // ClientProtocolPolicy set on the server side. ACE_DEBUG ((LM_DEBUG, "\n Test 1\n")); - server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test 2: Set the ORB-level ClientProtocolPolicy override, and @@ -176,16 +176,16 @@ main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_test (server1.in (), - "ERROR: Test 2 failed\n" TAO_ENV_ARG_PARAMETER); + "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test 3: Attempt the invocation on the second object reference @@ -194,7 +194,7 @@ main (int argc, char *argv[]) // conflicts. ACE_DEBUG ((LM_DEBUG, "\n Test 3\n")); - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test 4: Override ClientProtocolPolicy on the Current level. @@ -212,16 +212,16 @@ main (int argc, char *argv[]) protocols[2].protocol_type = 5; policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_test (server2.in (), - "ERROR: Test 4 failed\n" TAO_ENV_ARG_PARAMETER); + "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test 5: Override ClientProtocolPolicy on the Current level @@ -235,21 +235,21 @@ main (int argc, char *argv[]) protocols[1].protocol_type = protocol_type; policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Testing over. Shut down server ORB. ACE_DEBUG ((LM_DEBUG, "\n Testing over\n")); - server2->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index f88ad59a419..e43b62ad6d5 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -16,10 +16,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -41,10 +41,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -113,21 +113,21 @@ create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER); + poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -155,7 +155,7 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -164,27 +164,27 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // RootPOA. object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return 1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create child POA with RTCORBA::ClientProtocolPolicy set. @@ -202,14 +202,14 @@ main (int argc, char *argv[]) poa_policy_list.length (1); poa_policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant. @@ -219,7 +219,7 @@ 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 TAO_ENV_ARG_PARAMETER); + ior_output_file1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; @@ -227,16 +227,16 @@ main (int argc, char *argv[]) // Create object 2. ACE_DEBUG ((LM_DEBUG, "\nActivated object two as ")); result = create_object (root_poa.in (), orb.in (), &server_impl, - ior_output_file2 TAO_ENV_ARG_PARAMETER); + ior_output_file2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; // Run ORB Event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index fea2d7d3fd8..b7b3731cf50 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -30,13 +30,13 @@ public: PortableServer::POA_ptr poa, Tests &tests); - void start (TAO_ENV_SINGLE_ARG_DECL) + void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void method (TAO_ENV_SINGLE_ARG_DECL) + void method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); int client_propagated (void); @@ -106,7 +106,7 @@ test_i::invocation_lane (CORBA::ULong lane) } void -test_i::start (TAO_ENV_SINGLE_ARG_DECL) +test_i::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -127,16 +127,16 @@ test_i::start (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Short current_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (current_thread_priority == default_thread_priority) @@ -145,25 +145,25 @@ test_i::start (TAO_ENV_SINGLE_ARG_DECL) test->servant_->invocation_lane (1); } - test->object_->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->object_->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = this->orb_->object_to_string (test->object_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = this->orb_->string_to_object (ior.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_var test_from_string = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - test_from_string->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test_from_string->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; iterator.advance (); @@ -204,14 +204,14 @@ test_i::thread_info (const char *method_name) } void -test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->thread_info ("test_i::method"); } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -221,16 +221,16 @@ class Server public: Server (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL); - void create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL); + void create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL); + void create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_DECL); void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, RTCORBA::PriorityModel priority_model - TAO_ENV_ARG_DECL); - void test (TAO_ENV_SINGLE_ARG_DECL); - void start_testing (TAO_ENV_SINGLE_ARG_DECL); - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void test (ACE_ENV_SINGLE_ARG_DECL); + void start_testing (ACE_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); CORBA::ORB_var orb_; RTCORBA::RTORB_var rt_orb_; @@ -251,7 +251,7 @@ public: Server::Server (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : stacksize_ (0), static_threads_ (1), dynamic_threads_ (0), @@ -264,54 +264,54 @@ Server::Server (int argc, CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; object = this->orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->current_ = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; default_thread_priority = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; object = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->root_poa_ = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_manager_ = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Server::create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL) +Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL) { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -329,12 +329,12 @@ Server::create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL) this->tests_[this->tests_.size () - 1].servant_ = servant; this->tests_[this->tests_.size () - 1].object_ = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL) +Server::create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_DECL) { RTCORBA::ThreadpoolId threadpool_id = this->rt_orb_->create_threadpool (this->stacksize_, @@ -344,17 +344,17 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL) this->allow_request_buffering_, this->max_buffered_requests_, this->max_request_buffer_size_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var implicit_activation_policy = this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policies; @@ -371,7 +371,7 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL) this->root_poa_->create_POA ("tp_child", this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -390,14 +390,14 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL) this->tests_[this->tests_.size () - 1].servant_ = servant; this->tests_[this->tests_.size () - 1].object_ = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, RTCORBA::PriorityModel priority_model - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolLanes lanes (2); lanes.length (2); @@ -417,18 +417,18 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->allow_request_buffering_, this->max_buffered_requests_, this->max_request_buffer_size_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, default_thread_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policies; @@ -445,12 +445,12 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->root_poa_->create_POA (poa_name, this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant1 = 0; @@ -483,13 +483,13 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; id2 = rt_poa->activate_object_with_priority (servant2, default_thread_priority + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -501,29 +501,29 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, id1 = rt_poa->activate_object (servant1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; id2 = rt_poa->activate_object (servant2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Object_var object1 = poa->id_to_reference (id1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object2 = poa->id_to_reference (id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = test::_narrow (object1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant1; ACE_CHECK; @@ -531,14 +531,14 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, this->tests_.size (this->tests_.size () + 1); this->tests_[this->tests_.size () - 1].object_ = test::_narrow (object2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); this->tests_[this->tests_.size () - 1].servant_ = servant2; ACE_CHECK; } void -Server::start_testing (TAO_ENV_SINGLE_ARG_DECL) +Server::start_testing (ACE_ENV_SINGLE_ARG_DECL) { Tests::ITERATOR iterator (this->tests_); while (!iterator.done ()) @@ -549,7 +549,7 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL) if (test->servant_->client_propagated ()) { CORBA::Short current_thread_priority = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (current_thread_priority == default_thread_priority) @@ -558,7 +558,7 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL) test->servant_->invocation_lane (1); } - test->object_->start (TAO_ENV_SINGLE_ARG_PARAMETER); + test->object_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; iterator.advance (); @@ -566,29 +566,29 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL) } void -Server::test (TAO_ENV_SINGLE_ARG_DECL) +Server::test (ACE_ENV_SINGLE_ARG_DECL) { - this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER); + this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\n\n*** Changing priority to be higher ***\n\n")); this->current_->the_priority (default_thread_priority + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER); + this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Server::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Server::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->shutdown (1 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -599,29 +599,29 @@ main (int argc, char *argv[]) { Server server (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server.create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_PARAMETER); + server.create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa", RTCORBA::CLIENT_PROPAGATED - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa", RTCORBA::SERVER_DECLARED - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server.test (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY 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 dcd58ff34b0..10fb0be1150 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -44,7 +44,7 @@ parse_args (int argc, char *argv[]) RTCORBA::ThreadpoolId create_threadpool (RTCORBA::RTORB_ptr rt_orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolId id = rt_orb->create_threadpool (stacksize, @@ -54,7 +54,7 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return id; @@ -62,7 +62,7 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb RTCORBA::ThreadpoolId create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolLanes lanes (2); lanes.length (2); @@ -82,7 +82,7 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return id; @@ -97,31 +97,31 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -136,24 +136,24 @@ main (int argc, char *argv[]) { RTCORBA::ThreadpoolId id = create_threadpool (rt_orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; rt_orb->destroy_threadpool (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; id = create_threadpool_with_lanes (rt_orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; rt_orb->destroy_threadpool (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 3319ee9fae4..6b770e35e91 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -54,7 +54,7 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -63,29 +63,29 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return 1; // Test object. - object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server.in (), "server") == -1) return 1; @@ -108,12 +108,12 @@ main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -121,7 +121,7 @@ main (int argc, char *argv[]) CORBA::PolicyList_var pols; int status = server->_validate_connection (pols.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!status) @@ -134,7 +134,7 @@ main (int argc, char *argv[]) // NO new connections should get established. ACE_DEBUG ((LM_DEBUG, "\n Test 2\n")); - server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test 3: Check that <validate_connection> detects policy @@ -150,16 +150,16 @@ main (int argc, char *argv[]) protocols[0].protocol_type = TAO_TAG_UIOP_PROFILE; policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; status = server->_validate_connection (pols.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status) @@ -188,14 +188,14 @@ main (int argc, char *argv[]) protocols[0].protocol_type = TAO_TAG_SHMEM_PROFILE; policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index d0801d884c2..ba4d598df0d 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -17,10 +17,10 @@ public: // ctor // = The Test methods. - void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -34,7 +34,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -42,10 +42,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -96,22 +96,22 @@ create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER); + poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -139,7 +139,7 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -148,17 +148,17 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return 1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Servant. @@ -170,16 +170,16 @@ main (int argc, char *argv[]) orb.in (), &server_impl, ior_output_file - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; // Run ORB Event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index d60fc0fc5e3..83ff5df4a3a 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -92,12 +92,12 @@ Worker_Thread::svc (void) ACE_TRY_NEW_ENV { this->current_->the_priority (this->priority_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < iterations; i++) { - this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -123,7 +123,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -133,46 +133,46 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; current->the_priority (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Short_Array priorities; @@ -191,14 +191,14 @@ main (int argc, char **argv) bands_file, rt_orb.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; u_long i = 0; @@ -244,7 +244,7 @@ main (int argc, char **argv) if (shutdown_server) { - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp index c5f1b31b73f..8733eb3a276 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp @@ -10,7 +10,7 @@ get_priority_bands (const char *test_type, const char *bands_file, RTCORBA::RTORB_ptr rt_orb, CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // // Read bands from a file. @@ -90,7 +90,7 @@ get_priority_bands (const char *test_type, CORBA::Policy_var banded_connection_policy = rt_orb->create_priority_banded_connection_policy (bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies.length (policies.length () + 1); @@ -188,7 +188,7 @@ get_priority_lanes (const char *test_type, CORBA::ULong max_request_buffer_size, CORBA::Boolean allow_borrowing, CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Short_Array priorities; int result = @@ -219,12 +219,12 @@ get_priority_lanes (const char *test_type, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies.length (policies.length () + 1); @@ -245,7 +245,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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolLanes lanes; lanes.length (number_of_lanes); @@ -300,19 +300,19 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_priority_banded_connection_policy (bands - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 38e267f9d49..bdbad4ee4a9 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -14,13 +14,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (TAO_ENV_SINGLE_ARG_DECL) + void method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: @@ -36,7 +36,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -44,19 +44,19 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -109,7 +109,7 @@ static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { FILE *file = ACE_OS::fopen (filename, "w"); @@ -117,7 +117,7 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; u_int result = 0; @@ -145,17 +145,17 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -165,16 +165,16 @@ main (int argc, char **argv) object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies; @@ -184,7 +184,7 @@ main (int argc, char **argv) bands_file, rt_orb.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; @@ -201,7 +201,7 @@ main (int argc, char **argv) max_request_buffer_size, allow_borrowing, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; @@ -209,13 +209,13 @@ main (int argc, char **argv) CORBA::Policy_var priority_model_policy = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Implicit_activation policy. CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies.length (policies.length () + 1); @@ -230,7 +230,7 @@ main (int argc, char **argv) root_poa->create_POA ("child", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_i *servant = 0; @@ -243,22 +243,22 @@ main (int argc, char **argv) PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; write_iors_to_file (test.in (), orb.in (), ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index e5f063ef5db..29d46e55c91 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -151,7 +151,7 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -161,11 +161,11 @@ main (int argc, char *argv[]) // Priority Mapping Manager. CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1) return 1; @@ -175,19 +175,19 @@ main (int argc, char *argv[]) // RTCurrent. object = - orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (current.in (), "RTCurrent") == -1) return 1; // Obtain Test object reference. object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server.in (), "Test object") == -1) return 1; @@ -196,18 +196,18 @@ main (int argc, char *argv[]) // PriorityModelPolicy. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return 1; RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority_model != RTCORBA::CLIENT_PROPAGATED) ACE_ERROR_RETURN ((LM_ERROR, @@ -264,9 +264,9 @@ main (int argc, char *argv[]) // Testing over. Shut down the server. ACE_DEBUG ((LM_DEBUG, "Client threads finished\n")); - current->the_priority (priority1 TAO_ENV_ARG_PARAMETER); + current->the_priority (priority1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -299,10 +299,10 @@ Worker_Thread::svc (void) { // RTORB. CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 0; @@ -310,10 +310,10 @@ Worker_Thread::svc (void) // PolicyCurrent. object = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) @@ -332,12 +332,12 @@ Worker_Thread::svc (void) policy_list.length (1); policy_list[0] = rt_orb->create_client_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for other threads. @@ -346,7 +346,7 @@ Worker_Thread::svc (void) for (int i = 0; i < iterations; ++i) { // Invoke method. - this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 1c3c0ee9ad2..7326bf6d5fe 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -16,10 +16,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -33,17 +33,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_method invoked\n")); } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -100,7 +100,7 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -109,27 +109,27 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // RootPOA. object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return 1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED PriorityModelPolicy. @@ -138,31 +138,31 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create object. Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server = child_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); @@ -180,11 +180,11 @@ main (int argc, char *argv[]) } // Activate POA manager. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start ORB event loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp index e8c7cadba07..a401b67193f 100644 --- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp +++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp @@ -31,19 +31,19 @@ test_multiple_orbs (const char *test_name, CORBA::ORB_init (argc, argv, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rt_orb) { CORBA::Object_var object = orbs[i]->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; rt_orbs[i] = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ()); @@ -56,7 +56,7 @@ test_multiple_orbs (const char *test_name, i < iterations; ++i) { - orbs[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orbs[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index d8de32f08be..9fc50f20a4b 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -58,7 +58,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -68,23 +68,23 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < iterations; i++) { - test->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (shutdown_server) { - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index f9a2ee4eaa5..8b4269ac9e7 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -12,13 +12,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (TAO_ENV_SINGLE_ARG_DECL) + void method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: @@ -34,7 +34,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -42,19 +42,19 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -112,7 +112,7 @@ static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { FILE *file = ACE_OS::fopen (filename, "w"); @@ -120,7 +120,7 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (debug) @@ -144,18 +144,18 @@ void create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr poa_manager - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList policies; CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var lifespan_policy = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies.length (policies.length () + 1); @@ -170,7 +170,7 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, root_poa->create_POA ("persistent_child", poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -183,13 +183,13 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (test.in (), orb, persistent_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -198,7 +198,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolId threadpool_id = rt_orb->create_threadpool (stacksize, @@ -208,17 +208,17 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var implicit_activation_policy = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policies; @@ -235,7 +235,7 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, root_poa->create_POA ("tp_child", poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -248,20 +248,20 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (test.in (), orb, transient_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -275,17 +275,17 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Policy_var lifespan_policy = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policies.length (policies.length () + 1); @@ -300,7 +300,7 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb, root_poa->create_POA ("invalid", PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This next line of code should not run because an exception @@ -332,7 +332,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -342,67 +342,67 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; create_poa_and_servant_with_tp_policy (orb.in (), rt_orb.in (), root_poa.in (), poa_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; create_poa_and_servant_with_persistent_policy (orb.in (), root_poa.in (), poa_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; create_poa_with_tp_and_persistent_policy (rt_orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 23c6fd3679d..665b75c0b4e 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -65,7 +65,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -94,52 +94,52 @@ main (int argc, char **argv) CORBA::Object_var object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < iterations; i++) { current->the_priority (default_thread_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short priority = - test->method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority != TAO_INVALID_PRIORITY) { current->the_priority (priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - test->prioritized_method (TAO_ENV_SINGLE_ARG_PARAMETER); + test->prioritized_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } if (shutdown_server) { - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 15504b7afaf..52122ce985c 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -16,16 +16,16 @@ public: CORBA::Short server_priority, CORBA::Short client_priority); - CORBA::Short method (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Short method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void prioritized_method (TAO_ENV_SINGLE_ARG_DECL) + void prioritized_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: @@ -47,7 +47,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } CORBA::Short -test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -57,21 +57,21 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::prioritized_method (TAO_ENV_SINGLE_ARG_DECL) +test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Short priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -84,19 +84,19 @@ test_i::prioritized_method (TAO_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -147,7 +147,7 @@ static void write_iors_to_file (CORBA::Object_ptr object, CORBA::ORB_ptr orb, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { FILE *file = ACE_OS::fopen (filename, "w"); @@ -155,7 +155,7 @@ write_iors_to_file (CORBA::Object_ptr object, CORBA::String_var ior = orb->object_to_string (object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; u_int result = 0; @@ -178,87 +178,87 @@ public: PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr poa_manager); - void test_root_poa (TAO_ENV_SINGLE_ARG_DECL); - void test_child_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_root_poa (ACE_ENV_SINGLE_ARG_DECL); + void test_child_poa (ACE_ENV_SINGLE_ARG_DECL); typedef void (server::*test_function) (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_default_pool_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_bands_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_no_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_no_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void test_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); - void test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL); + void test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL); private: @@ -280,7 +280,7 @@ server::server (CORBA::ORB_ptr orb, } void -server::test_root_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL) { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -294,31 +294,31 @@ server::test_root_poa (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (test.in (), this->orb_.in (), "root" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_child_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL) { CORBA::PolicyList policies; policies.length (1); policies[policies.length () - 1] = this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA ("child", this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -333,13 +333,13 @@ server::test_child_poa (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var safe_servant (servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (test.in (), this->orb_.in (), "child" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -348,14 +348,14 @@ server::test_default_pool_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList empty_policies; (this->*function) (empty_policies, server_priority, client_priority, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -365,7 +365,7 @@ server::test_bands_poa (CORBA::PolicyList &policies, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::PriorityBands bands; bands.length (3); @@ -380,14 +380,14 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; (this->*function) (policies, server_priority, client_priority, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -396,7 +396,7 @@ server::test_no_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolId threadpool_id = this->rt_orb_->create_threadpool (stacksize, @@ -406,12 +406,12 @@ server::test_no_lanes_poa (CORBA::Short server_priority, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policies; @@ -423,7 +423,7 @@ server::test_no_lanes_poa (CORBA::Short server_priority, server_priority, client_priority, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -432,7 +432,7 @@ server::test_lanes_poa (CORBA::Short server_priority, CORBA::Short client_priority, server::test_function function, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::ThreadpoolLanes lanes; lanes.length (3); @@ -456,12 +456,12 @@ server::test_lanes_poa (CORBA::Short server_priority, allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Policy_var threadpool_policy = this->rt_orb_->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policies; @@ -473,7 +473,7 @@ server::test_lanes_poa (CORBA::Short server_priority, server_priority, client_priority, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -482,25 +482,25 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, default_thread_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -516,18 +516,18 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, PortableServer::ObjectId_var id = rt_poa->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (object.in (), this->orb_.in (), test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -536,80 +536,80 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->test_bands_poa (policies, server_priority, client_priority, &server::test_no_bands_client_propagated_poa, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, &server::test_no_bands_client_propagated_poa, "default_pool_no_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, &server::test_no_bands_client_propagated_poa, "no_lanes_no_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_lanes_poa (::client_priority, ::client_priority, &server::test_no_bands_client_propagated_poa, "lanes_no_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, &server::test_bands_client_propagated_poa, "default_pool_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, &server::test_bands_client_propagated_poa, "no_lanes_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_lanes_poa (::client_priority, ::client_priority + 1, &server::test_bands_client_propagated_poa, "lanes_bands_client_propagated" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -619,25 +619,25 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, default_thread_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = this->root_poa_->create_POA (test_name, this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; test_i *servant = 0; @@ -654,18 +654,18 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, PortableServer::ObjectId_var id = rt_poa->activate_object_with_priority (servant, ::server_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; write_iors_to_file (object.in (), this->orb_.in (), test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -674,80 +674,80 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies, CORBA::Short server_priority, CORBA::Short client_priority, const char *test_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->test_bands_poa (policies, server_priority, client_priority, &server::test_no_bands_server_declared_poa, test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_default_pool_poa (::server_priority, ::client_priority + 1, &server::test_no_bands_server_declared_poa, "default_pool_no_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_no_lanes_poa (::server_priority, ::client_priority - 1, &server::test_no_bands_server_declared_poa, "no_lanes_no_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_lanes_poa (::server_priority, ::client_priority + 1, &server::test_no_bands_server_declared_poa, "lanes_no_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_default_pool_poa (::server_priority, ::client_priority - 1, &server::test_bands_server_declared_poa, "default_pool_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_no_lanes_poa (::server_priority, ::client_priority + 1, &server::test_bands_server_declared_poa, "no_lanes_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -server::test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL) +server::test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL) { this->test_lanes_poa (::server_priority, ::client_priority - 1, &server::test_bands_server_declared_poa, "lanes_bands_server_declared" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -764,17 +764,17 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The following sets the current thread to the lowest priority @@ -798,16 +798,16 @@ main (int argc, char **argv) object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; client_priority = @@ -823,16 +823,16 @@ main (int argc, char **argv) object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; server server (orb.in (), @@ -840,55 +840,55 @@ main (int argc, char **argv) root_poa.in (), poa_manager.in ()); - server.test_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_child_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_child_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - server.test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + server.test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index 940062c0f5b..0815c6c4973 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -57,7 +57,7 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -66,37 +66,37 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // PolicyCurrent. object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (policy_current.in (), "PolicyCurrent") == -1) return 1; // Test object 1. - object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return 1; // Test object 2. - object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return 1; @@ -106,34 +106,34 @@ main (int argc, char *argv[]) // following three. ACE_DEBUG ((LM_DEBUG, "\n Invocation 1 --> new connection\n")); - server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 2 --> use connection from invocation 1\n")); - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 3 --> use connection from invocation 1\n")); - server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 4 --> use connection from invocation 1\n")); - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Set RTCORBA::PrivateConnectionPolicy on PolicyCurrent. CORBA::PolicyList policy_list; policy_list.length (1); policy_list[0] = - rt_orb->create_private_connection_policy (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_orb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Make four invocations on test objects again. This time, // since RTCORBA::PrivateConnectionPolicy is set, we expect a @@ -143,28 +143,28 @@ main (int argc, char *argv[]) // third, and <server2>'s reused on fourth. ACE_DEBUG ((LM_DEBUG, "\n Invocation 5 --> new connection\n")); - server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 6 --> new connection\n")); - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 7 --> use connection from invocation 5\n")); - server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n Invocation 8 --> use connection from invocation 6\n")); - server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Testing over. Shut down Server ORB. ACE_DEBUG ((LM_DEBUG, "\n Testing over - shutting down\n")); - server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 69de99f823e..792bd559cbf 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -15,10 +15,10 @@ public: // ctor // = The Test methods. - void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) +Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -40,10 +40,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAM } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -100,22 +100,22 @@ create_object (PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, Test_i *server_impl, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register with poa. PortableServer::ObjectId_var id = - poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER); + poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -143,7 +143,7 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -152,17 +152,17 @@ main (int argc, char *argv[]) // RootPOA. CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return 1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Servants. @@ -175,7 +175,7 @@ main (int argc, char *argv[]) orb.in (), &server_impl1, ior_output_file1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; @@ -184,16 +184,16 @@ main (int argc, char *argv[]) orb.in (), &server_impl2, ior_output_file2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; // Run ORB Event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index b5db53f4614..70c129f16ad 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -66,22 +66,22 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::Mutex_var my_mutex; - my_mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER); + my_mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - rt_orb->destroy_mutex (my_mutex.in () TAO_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (my_mutex.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -109,7 +109,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) CORBA::Boolean created_flag; larry_mutex1 = rt_orb->create_named_mutex ("larry", - created_flag TAO_ENV_ARG_PARAMETER); + created_flag ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (created_flag != 1) @@ -119,7 +119,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) moe_mutex1 = rt_orb->create_named_mutex ("moe", created_flag - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (created_flag != 1) @@ -127,10 +127,10 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) "ERROR: Expected named mutex moe to be created, but it wasn't\n"), 1); - larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test creating the mutex a second time @@ -138,7 +138,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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (created_flag != 0) @@ -153,10 +153,10 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) "ERROR: Should have gotten the same mutex, but didn't\n"), 1); - larry_mutex2->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex2->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - larry_mutex2->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex2->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -164,7 +164,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::Mutex_var larry_mutex3; larry_mutex3 = rt_orb->open_named_mutex ("larry" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // test the pointers... @@ -174,24 +174,24 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb) "ERROR: Should have gotten the same mutex, but didn't\n"), 1); - larry_mutex3->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex3->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - larry_mutex3->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex3->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Make sure that nothing has been broken behind the scenes. - larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER); + larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - rt_orb->destroy_mutex (larry_mutex1.in () TAO_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (larry_mutex1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - rt_orb->destroy_mutex (moe_mutex1.in () TAO_ENV_ARG_PARAMETER); + rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -216,7 +216,7 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb) { RTCORBA::Mutex_var larry_mutex1; - larry_mutex1 = rt_orb->open_named_mutex ("larry" TAO_ENV_ARG_PARAMETER); + larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ERROR_RETURN ((LM_ERROR, @@ -340,7 +340,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb) ACE_TRY_NEW_ENV { - RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER); + RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_data.mutex = mutex; @@ -385,7 +385,7 @@ mutex_test_try_lock_thread (void *args) { // check that try_lock (0) returns false ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n")); - result = mutex->try_lock (0u TAO_ENV_ARG_PARAMETER); + result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) @@ -405,7 +405,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*/ TAO_ENV_ARG_PARAMETER); + result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; timer.stop (); @@ -456,12 +456,12 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) ACE_TRY_NEW_ENV { - RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER); + RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // 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 TAO_ENV_ARG_PARAMETER); + result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) ACE_ERROR_RETURN ((LM_ERROR, @@ -506,7 +506,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { // ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -515,10 +515,10 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 4acef208296..3d5583a0f41 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -51,22 +51,22 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) CORBA::Short check_policy (Test_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (priority_model != RTCORBA::SERVER_DECLARED) ACE_ERROR_RETURN ((LM_ERROR, @@ -74,7 +74,7 @@ check_policy (Test_ptr server "RTCORBA::SERVER_DECLARED!\n"), -1); - return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -90,7 +90,7 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -99,19 +99,19 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Object_var object = - orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return 1; // Test object 2. - object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return 1; @@ -121,7 +121,7 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Short server1_priority = - check_policy (server1.in () TAO_ENV_ARG_PARAMETER); + check_policy (server1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server1_priority == -1) @@ -129,7 +129,7 @@ main (int argc, char *argv[]) // Test object 2. CORBA::Short server2_priority = - check_policy (server2.in () TAO_ENV_ARG_PARAMETER); + check_policy (server2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server2_priority == -1) return 1; @@ -137,16 +137,16 @@ main (int argc, char *argv[]) // Testing: make several invocations on test objects. for (int i = 0; i < 5; ++i) { - server1->test_method (server1_priority TAO_ENV_ARG_PARAMETER); + server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server2->test_method (server2_priority TAO_ENV_ARG_PARAMETER); + server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Testing over. Shut down Server ORB. - server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index ffccc07a31f..4091d002eb5 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -16,10 +16,10 @@ public: // ctor void test_method (CORBA::Short priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -34,25 +34,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (obj.in ())) ACE_THROW (CORBA::INTERNAL ()); CORBA::Short servant_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Print out the info. @@ -68,10 +68,10 @@ Test_i::test_method (CORBA::Short priority } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -160,7 +160,7 @@ create_object (RTPortableServer::POA_ptr poa, Test_i *server_impl, CORBA::Short priority, const char *filename - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register with poa. PortableServer::ObjectId_var id; @@ -168,20 +168,20 @@ create_object (RTPortableServer::POA_ptr poa, if (priority > -1) id = poa->activate_object_with_priority (server_impl, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else - id = poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER); + id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Print out the IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ())); @@ -213,7 +213,7 @@ main (int argc, char *argv[]) { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -222,27 +222,27 @@ main (int argc, char *argv[]) // RTORB. CORBA::Object_var object = - orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_orb.in (), "RTORB") == -1) return 1; // RootPOA. object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (root_poa.in (), "RootPOA") == -1) return 1; // POAManager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create child POA with SERVER_DECLARED PriorityModelPolicy, @@ -253,23 +253,23 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED, poa_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; poa_policy_list[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTPortableServer::POA_var rt_poa = - RTPortableServer::POA::_narrow (child_poa.in () TAO_ENV_ARG_PARAMETER); + RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check_for_nil (rt_poa.in (), "RTPOA") == -1) return 1; @@ -282,7 +282,7 @@ main (int argc, char *argv[]) int result; ACE_DEBUG ((LM_DEBUG, "\nActivated object one as ")); result = create_object (rt_poa.in (), orb.in (), &server_impl, - -1, ior_output_file1 TAO_ENV_ARG_PARAMETER); + -1, ior_output_file1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; @@ -290,17 +290,17 @@ main (int argc, char *argv[]) // Create object 2 (override POA's priority). ACE_DEBUG ((LM_DEBUG, "\nActivated object two as ")); result = create_object (rt_poa.in (), orb.in (), &server_impl, - object_priority, ior_output_file2 TAO_ENV_ARG_PARAMETER); + object_priority, ior_output_file2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; // Activate POA manager. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start ORB event loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index c9e04b9131f..2d8a3340175 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) { // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -62,7 +62,7 @@ main (int argc, char *argv[]) } // Make an invocation on the obtained Test object. - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index a5ab9ea5636..99c8f19d00d 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -16,7 +16,7 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -30,12 +30,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Received request to shut down the ORB\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -85,7 +85,7 @@ parse_args (int argc, char *argv[]) int check_default_server_protocol (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Users should never write code like below. // It is for testing purposes only! (Unfortunately, there @@ -95,7 +95,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb RTCORBA::ServerProtocolPolicy_var policy = RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (policy.in ())) @@ -104,7 +104,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb "is missing\n"), -1); - RTCORBA::ProtocolList_var protocols = policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER); + RTCORBA::ProtocolList_var protocols = policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -126,7 +126,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!CORBA::is_nil (tcp_properties.in ())) @@ -144,7 +144,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb RTCORBA::UnixDomainProtocolProperties_var uiop_properties = RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -169,18 +169,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -189,18 +189,18 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check ORB default ServerProtocol configuration. int result = check_default_server_protocol (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return 1; @@ -222,7 +222,7 @@ main (int argc, char *argv[]) poa_policy_list.length (1); poa_policy_list[0] = rt_orb->create_server_protocol_policy (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa; @@ -233,7 +233,7 @@ main (int argc, char *argv[]) root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -246,17 +246,17 @@ main (int argc, char *argv[]) Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print Object IOR. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ())); @@ -274,10 +274,10 @@ main (int argc, char *argv[]) } // Run ORB Event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 2415f06176f..c2623195e68 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -58,7 +58,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -67,11 +67,11 @@ main (int argc, char *argv[]) return result; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = - test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; pid_t pid = @@ -82,7 +82,7 @@ main (int argc, char *argv[]) CORBA::Long r = test->method (pid, i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (r == i); @@ -92,7 +92,7 @@ main (int argc, char *argv[]) if (shutdown_server) { - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 192350c0c60..63b1ea466d3 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -58,11 +58,11 @@ parse_args (int argc, char *argv[]) int write_ior_to_file (CORBA::ORB_ptr orb, test_ptr test - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::String_var ior = orb->object_to_string (test - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); char filename[BUFSIZ]; @@ -97,7 +97,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::POA_ptr root_poa, CORBA::ORB_ptr orb, RTCORBA::RTORB_ptr rt_orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Policies for the firstPOA to be created. CORBA::PolicyList policies (3); policies.length (3); @@ -106,7 +106,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, policies[0] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Thread pool policy. @@ -117,7 +117,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, policies[2] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create the POA under the RootPOA. @@ -125,7 +125,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, root_poa->create_POA (poa_name, poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Creation of POAs is over. Destroy the Policy objects. @@ -133,7 +133,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -146,13 +146,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, ACE_UNUSED_ARG (safe_servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int result = write_ior_to_file (orb, test.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -171,45 +171,45 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Priority default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -221,19 +221,19 @@ main (int argc, char *argv[]) root_poa.in (), nap_time); test_var test = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; result = write_ior_to_file (orb.in (), test.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong stacksize = 0; @@ -249,12 +249,12 @@ main (int argc, char *argv[]) allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_1 = rt_orb->create_threadpool_policy (threadpool_id_1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean allow_borrowing = 0; @@ -276,12 +276,12 @@ main (int argc, char *argv[]) allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Policy_var threadpool_policy_2 = rt_orb->create_threadpool_policy (threadpool_id_2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = @@ -291,7 +291,7 @@ main (int argc, char *argv[]) root_poa.in (), orb.in (), rt_orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; @@ -303,15 +303,15 @@ main (int argc, char *argv[]) root_poa.in (), orb.in (), rt_orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index 03c8b5b52b4..d3079c4283e 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -19,7 +19,7 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Long test_i::method (CORBA::Long client_id, CORBA::Long iteration - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. @@ -49,16 +49,16 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index 5fed9fa6379..d3c8bf5af4e 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -23,15 +23,15 @@ public: /// Test method. CORBA::Long method (CORBA::Long client_id, CORBA::Long iteration - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Our POA. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// ORB. diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp index 0de4f50137e..106c14a0ec0 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -12,29 +12,29 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb) } void -Oneway_Receiver::raise_no_permission (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::raise_no_permission (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::NO_PERMISSION ()); } void -Oneway_Receiver::destroy (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } Test::Shutdown_Helper_ptr -Oneway_Receiver::get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL) +Oneway_Receiver::get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Shutdown_Helper *shutdown_helper; @@ -45,5 +45,5 @@ Oneway_Receiver::get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var transfer_ownership(shutdown_helper); - return shutdown_helper->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return shutdown_helper->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index 0dba48dc0e8..5438e18bf41 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -25,13 +25,13 @@ public: Oneway_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void raise_no_permission (TAO_ENV_SINGLE_ARG_DECL) + virtual void raise_no_permission (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Test::Shutdown_Helper_ptr get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL) + virtual Test::Shutdown_Helper_ptr get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index 8c5e8b0781e..38ffc90ed4b 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -11,8 +11,8 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) } void -Shutdown_Helper::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Shutdown_Helper::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index 09ee8bba3fa..d1686561a5e 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -25,7 +25,7 @@ public: Shutdown_Helper (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index 97fd5efbe17..a49e15b2807 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -69,13 +69,13 @@ parse_args (int argc, char *argv[]) } void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int @@ -84,18 +84,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Oneway_Receiver_var oneway_receiver = - Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (oneway_receiver.in ())) @@ -110,28 +110,28 @@ main (int argc, char *argv[]) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n")); run_test_sync_with_target (oneway_receiver.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (test_sync_with_server) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_SERVER\n")); run_test_sync_with_server (oneway_receiver.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (test_sync_with_transport) { ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TRANSPORT\n")); run_test_sync_with_transport (oneway_receiver.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n")); run_test_sync_none (oneway_receiver.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -147,7 +147,7 @@ main (int argc, char *argv[]) "ERROR: Mismatched number of calls (%d + %d != %d)\n", successful_calls, failed_calls, iterations)); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -163,18 +163,18 @@ main (int argc, char *argv[]) void set_sync_scope_policy (Messaging::SyncScope sync_scope - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (policy_current.in ())) @@ -189,14 +189,14 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, scope_as_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -204,7 +204,7 @@ void run_one_iteration (int i, Test::Oneway_Receiver_ptr oneway_receiver, Test::Shutdown_Helper_ptr shutdown_helper - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -212,14 +212,14 @@ run_one_iteration (int i, { ACE_DEBUG ((LM_DEBUG, "Destroying object\n")); server_status = DESTROYED; - oneway_receiver->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (i == 2 * iterations / 3) { ACE_DEBUG ((LM_DEBUG, "Shutting down server process\n")); server_status = SHUTDOWN; - shutdown_helper->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + shutdown_helper->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -228,7 +228,7 @@ run_one_iteration (int i, } ACE_ENDTRY; - oneway_receiver->raise_no_permission (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->raise_no_permission (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -243,13 +243,13 @@ call_failed (const CORBA::SystemException &ex) void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - set_sync_scope_policy (Messaging::SYNC_WITH_TARGET TAO_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_TARGET ACE_ENV_ARG_PARAMETER); ACE_CHECK; Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; int had_comm_failure = 0; @@ -258,7 +258,7 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver ACE_TRY { run_one_iteration (i, oneway_receiver, shutdown_helper.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::NO_PERMISSION, ex) @@ -300,13 +300,13 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - set_sync_scope_policy (Messaging::SYNC_WITH_SERVER TAO_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_SERVER ACE_ENV_ARG_PARAMETER); ACE_CHECK; Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; int had_comm_failure = 0; @@ -315,7 +315,7 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver ACE_TRY { run_one_iteration (i, oneway_receiver, shutdown_helper.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server_status == DESTROYED @@ -361,37 +361,37 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver /// Helper routine to run the sync_with_transport and sync_none tests. void run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT TAO_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT ACE_ENV_ARG_PARAMETER); ACE_CHECK; - run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER); + run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - set_sync_scope_policy (Messaging::SYNC_NONE TAO_ENV_ARG_PARAMETER); + set_sync_scope_policy (Messaging::SYNC_NONE ACE_ENV_ARG_PARAMETER); ACE_CHECK; - run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER); + run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Test::Shutdown_Helper_var shutdown_helper = - oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; int undetected = 0; @@ -401,7 +401,7 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver ACE_TRY { run_one_iteration (i, oneway_receiver, shutdown_helper.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // A few failures can go undetected... diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 0bff331018c..a198c55d3b5 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -39,15 +39,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -56,7 +56,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -69,11 +69,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index ad640088619..31cf7652b1a 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -11,14 +11,14 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb) } void -Ping_Service::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Ping_Service::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Ping_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Ping_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index 728a5e6def7..97d2a934099 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -25,10 +25,10 @@ public: Ping_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void ping (TAO_ENV_SINGLE_ARG_DECL) + virtual void ping (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index d2fd0122245..c8263903192 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -45,18 +45,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Ping_Service_var ping_service = - Test::Ping_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test::Ping_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ping_service.in ())) @@ -69,17 +69,17 @@ main (int argc, char *argv[]) for (int i = 0; i != 10; ++i) { - ping_service->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_service->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (do_shutdown) { - ping_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 19117df1d8e..7ba0ae00538 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -38,15 +38,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -55,7 +55,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(ping_service_impl); Test::Ping_Service_var ping_service = - ping_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (ping_service.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ping_service.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -85,18 +85,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index edd0773c52f..7e69d9350cf 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -71,7 +71,7 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -80,7 +80,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -91,12 +91,12 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <test> reference. test_var test_object = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test::data the_data0 (data_bytes); @@ -119,19 +119,19 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i, the_data0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke the oneway method. test_object->method (i, the_data1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke the oneway method. test_object->method (i, the_data2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -140,7 +140,7 @@ main (int argc, char **argv) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending a shutdown call..\n")); - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -150,7 +150,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 6f82d84ac69..13f7c855cfd 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index 2ee2f038975..9b0120c488c 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, const test::data & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -27,11 +27,11 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown... ")); this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index 8f921b977d1..39387592b14 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -30,10 +30,10 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, const test::data & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 65826c42908..949c299e773 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -9,7 +9,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) Test_ptr Smart_Test_Factory::create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -28,12 +28,12 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::box_prices (TAO_ENV_SINGLE_ARG_DECL) +Smart_Test_Proxy::box_prices (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->price_ == 0) { - this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (TAO_ENV_SINGLE_ARG_PARAMETER); + this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return this->price_; diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index 5cafabfec5e..b3ac7e0c5d9 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -8,7 +8,7 @@ public: Smart_Test_Factory (void); virtual Test_ptr create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method will create the smart_proxy. }; @@ -17,7 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short box_prices(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short box_prices(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index e155adea751..ac4c6ea4623 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -119,7 +119,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -127,7 +127,7 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (register_smart_proxy == 1) { @@ -151,7 +151,7 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -174,7 +174,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price = server->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER); + price = server->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (price < 300) @@ -194,13 +194,13 @@ main (int argc, char *argv[]) marker.dump_stats ("buying tickets ", gsf); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /* Test_var server1 = Test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -223,7 +223,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price1 = server1->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER); + price1 = server1->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (price1 < 300) @@ -243,7 +243,7 @@ main (int argc, char *argv[]) marker1.dump_stats ("buying tickets using a default proxy ", gsf1); - server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; */ } diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index f029aefbd0d..4fb9002020f 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -28,14 +28,14 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short box_prices (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Short box_prices (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long tickets (CORBA::Short number - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -49,7 +49,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i::box_prices (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::box_prices (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 125; @@ -57,17 +57,17 @@ Test_i::box_prices (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Long Test_i::tickets (CORBA::Short number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 125 * number; } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } static const char *ior_output_file = 0; @@ -100,7 +100,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -110,34 +110,34 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_var Test_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (Test_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -157,10 +157,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -168,7 +168,7 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp index a12bd8c64a6..9e7f85bec74 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[] TAO_ENV_ARG_DECL) +Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int result = this->parse_args (argc, argv); @@ -34,52 +34,52 @@ Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL) // Get an Object reference to RootPOA. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow the Object reference to a POA reference this->root_poa_ = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the POAManager of RootPOA this->poa_manager_ = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the diamond servant and its base classes under RootPOA. PortableServer::ObjectId_var id = this->root_poa_->activate_object (&this->top_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // // We only care about the most derived class here. -// this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); +// this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->diamond_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We only care about the most derived class here. this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->left_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = this->root_poa_->activate_object (&this->right_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var str = this->orb_->object_to_string (this->diamond_obj_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", @@ -97,7 +97,7 @@ Collocation_Test::parse_args (int argc, char *argv[]) } int -Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL) { // Ensure that the smart proxy is the one which is used by registering // the user-defined factory. Its necessary to create one on the heap so @@ -108,34 +108,34 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) -1); Diamond::Top_var top = - Diamond::Top::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER); + Diamond::Top::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Left_var left = - Diamond::Left::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER); + Diamond::Left::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Right_var right = - Diamond::Right::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER); + Diamond::Right::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Buttom_var buttom = - Diamond::Buttom::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER); + Diamond::Buttom::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); - str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ())); - str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ())); - str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER); + str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ())); @@ -143,12 +143,12 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) } int -Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h index 5d7a4ff12fc..94131c4fdff 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h @@ -27,17 +27,17 @@ class Collocation_Test public: Collocation_Test (void); - int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED); // Initializing the Collocation_Test object. int parse_args (int argc, char *argv[]); // Parse the test specific arguments. - int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // This test narrow an object reference to its base class and see // if it works correctly. - int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Run the test. private: diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp index df102e638a8..d3d9104b424 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp @@ -13,7 +13,7 @@ Top_i::~Top_i () } char * -Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,7 @@ Left_i::~Left_i () } char * -Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -41,7 +41,7 @@ Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -60,7 +60,7 @@ Right_i::~Right_i () } char * -Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -69,7 +69,7 @@ Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,7 @@ Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -98,7 +98,7 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -107,7 +107,7 @@ Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -116,7 +116,7 @@ Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Long -Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -125,7 +125,7 @@ Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h index 3b4540e57e9..37e4899af76 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h @@ -16,7 +16,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char* shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char* shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) }; @@ -28,11 +28,11 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) }; @@ -44,15 +44,15 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. }; @@ -64,19 +64,19 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the shape of this object (interface.) - virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the color of this object (interface.) - virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the width of the stuff. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the name of the object. }; diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index 65b2483243b..a054b238024 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -9,7 +9,7 @@ Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void) Diamond::Top_ptr Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -28,7 +28,7 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy) char * Smart_Diamond_Top_Proxy::shape ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -40,7 +40,7 @@ Smart_Diamond_Top_Proxy::shape ( char *ans= 0; ACE_TRY { - ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(TAO_ENV_SINGLE_ARG_PARAMETER)); + ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h index c89926eb6a5..87c0a8d453a 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h @@ -11,7 +11,7 @@ class ACE_Svc_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method will create the smart_proxy. }; @@ -24,7 +24,7 @@ class ACE_Svc_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy); virtual char * shape ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp index 71ff66d922a..bd883b7c6e5 100644 --- a/TAO/tests/Smart_Proxies/Collocation/main.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp @@ -12,10 +12,10 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER); + coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER); + coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp index 5d05e7d417e..62e5232517a 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp @@ -8,7 +8,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -19,7 +19,7 @@ Smart_Test_Proxy::method (CORBA::Short boo ACE_TRY { retval = TAO_Test_Smart_Proxy_Base::method (boo - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) 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 b466f3fbe0c..a31d8556f36 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h @@ -8,7 +8,7 @@ public: Smart_Test_Proxy (Test_ptr proxy); virtual CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 20d025118f4..1d8380fc600 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp @@ -10,7 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) Test_ptr Smart_Test_Factory::create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { 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 4ce95df91b1..16825ed5720 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h @@ -13,7 +13,7 @@ public: Smart_Test_Factory (void); virtual Test_ptr create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method will create the smart_proxy. }; diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 38576ea7d60..fa0ad5e077f 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -58,7 +58,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -66,7 +66,7 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // To use the smart proxy just enter it as a svc.conf @@ -74,7 +74,7 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -85,7 +85,7 @@ main (int argc, char *argv[]) server->method (0); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index aa8145b53ec..99d8cce8908 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -29,11 +29,11 @@ public: Test_i (CORBA::ORB_ptr orb); CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); @@ -98,7 +98,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -108,33 +108,33 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_var Test_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (Test_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -154,17 +154,17 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp index 1fdcda810e7..4123f962892 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp @@ -11,7 +11,7 @@ Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory) Test_ptr Smart_Test_Factory::create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -30,7 +30,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -41,7 +41,7 @@ Smart_Test_Proxy::method (CORBA::Short boo ACE_TRY { retval = TAO_Test_Smart_Proxy_Base::method (boo - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h index 10edb88bf24..f024b4b69f7 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h @@ -9,7 +9,7 @@ public: Smart_Test_Factory (int one_shot_factory = 1); virtual Test_ptr create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method will create the smart_proxy. }; @@ -19,7 +19,7 @@ public: Smart_Test_Proxy (Test_ptr proxy); virtual CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 b9a9b71b233..cfdaadb1a9f 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -68,26 +68,26 @@ run_test (CORBA::ORB_ptr orb_ptr, { object = orb->string_to_object (ior1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { object = orb->string_to_object (ior2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; Test_var server = Test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Object reference is nil\n"), 1); server->method (0); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -109,7 +109,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index d83fffb74e9..eb7b9a50edf 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -29,11 +29,11 @@ public: Test_i (CORBA::ORB_ptr orb); CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -62,10 +62,10 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } static const char *ior_output_file = 0; @@ -98,7 +98,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -108,34 +108,34 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_var Test_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (Test_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -155,10 +155,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -166,7 +166,7 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index 996a0e588d4..b49a86973b1 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -10,7 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (void) Test_ptr Smart_Test_Factory::create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n")); @@ -29,7 +29,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -40,7 +40,7 @@ Smart_Test_Proxy::method (CORBA::Short boo ACE_TRY { retval = TAO_Test_Smart_Proxy_Base::method (boo - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::Oops, reason) diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index 838a34b97ae..a61d96be76d 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -9,7 +9,7 @@ public: Smart_Test_Factory (void); virtual Test_ptr create_proxy (Test_ptr proxy - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method will create the smart_proxy. }; @@ -19,7 +19,7 @@ public: Smart_Test_Proxy (Test_ptr proxy); virtual CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) 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 7a1936ab633..e8d1327eeef 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -58,7 +58,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -66,7 +66,7 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // To use the smart proxy it is necessary to allocate the @@ -87,7 +87,7 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -98,7 +98,7 @@ main (int argc, char *argv[]) server->method (0); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index bf15eee2556..66bf39ba583 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -29,11 +29,11 @@ public: Test_i (CORBA::ORB_ptr orb); CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); @@ -98,7 +98,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -108,33 +108,33 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_var Test_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (Test_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -154,17 +154,17 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index 9886e27c16e..a554f94fea5 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -67,18 +67,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -91,7 +91,7 @@ main (int argc, char *argv[]) // Invoke a request on the server CORBA::Boolean ret_value = - server->print_status (TAO_ENV_SINGLE_ARG_PARAMETER); + server->print_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value == 0) @@ -103,11 +103,11 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index 589a59091aa..7c4d59157bc 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,18 +86,18 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index 8c9c75ef9b1..f6ca0ea9a94 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(tests, simple_test_i, "$Id$") CORBA::Boolean -Simple_Server_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -20,7 +20,7 @@ Simple_Server_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h index f58ecb402d5..ad353e0a263 100644 --- a/TAO/tests/Strategies/simple_test_i.h +++ b/TAO/tests/Strategies/simple_test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 11765552378..a3d05a6c5c5 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -116,7 +116,7 @@ parse_args (int argc, char **argv) void setup_timeouts (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Escape value. if (timeout == -1) @@ -124,13 +124,13 @@ setup_timeouts (CORBA::ORB_ptr orb // Obtain PolicyCurrent. CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TimeBase::TimeT rt_timeout = 10000 * timeout; @@ -144,31 +144,31 @@ setup_timeouts (CORBA::ORB_ptr orb rt_timeout_policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, rt_timeout_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; policy_current->set_policy_overrides (rt_timeout_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - rt_timeout_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + rt_timeout_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void setup_buffering_constraints (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain PolicyCurrent. CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the sync scope policy, i.e., the ORB will buffer oneways. @@ -187,17 +187,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb sync_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the sync scope. policy_current->set_policy_overrides (sync_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are now done with this policy. - sync_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Flush buffers. @@ -219,24 +219,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the constraints. policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are done with the policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -245,7 +245,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -256,22 +256,22 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <test> reference. test_var test_object = test::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup buffering. setup_buffering_constraints (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup timeout. setup_timeouts (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test::data the_data (data_bytes); @@ -287,7 +287,7 @@ main (int argc, char **argv) test_object->method (i, the_data, work - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Interval between successive calls. @@ -300,7 +300,7 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -310,7 +310,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 6f82d84ac69..13f7c855cfd 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index ae78c1de3e6..9fbd1859f2a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -13,7 +13,7 @@ void test_i::method (CORBA::ULong request_number, const test::data &, CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -29,9 +29,9 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h index 06723f6b263..48b20f4057f 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.h +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h @@ -31,10 +31,10 @@ public: void method (CORBA::ULong request_number, const test::data &, CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 4fc08c121d0..a6c340c3142 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -54,11 +54,11 @@ void send_echo (CORBA::ORB_ptr orb, Simple_Server_ptr server, CORBA::Long t - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - server->echo (0, t TAO_ENV_ARG_PARAMETER); + server->echo (0, t ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; in_time_count++; @@ -76,7 +76,7 @@ send_echo (CORBA::ORB_ptr orb, (max_timeout % 1000) * 1000); // This is a non-standard TAO call. - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -88,18 +88,18 @@ int main (int argc, char* argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -112,20 +112,20 @@ int main (int argc, char* argv[]) object = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT mid_value = @@ -143,19 +143,19 @@ int main (int argc, char* argv[]) policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = server->_set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var timeout_server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; policy_list[0] = CORBA::Policy::_nil (); @@ -175,14 +175,14 @@ int main (int argc, char* argv[]) policy_list.length (0); policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); + send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -192,18 +192,18 @@ int main (int argc, char* argv[]) policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_orb - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); + send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -213,23 +213,23 @@ int main (int argc, char* argv[]) policy_list[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_thread - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER); + send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, // "client(%P) Use the object policies\n")); - send_echo (orb.in (), timeout_server.in (), t TAO_ENV_ARG_PARAMETER); + send_echo (orb.in (), timeout_server.in (), t ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -239,17 +239,17 @@ int main (int argc, char* argv[]) policy_list.length (0); policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - send_echo (orb.in (), server.in (), 0 TAO_ENV_ARG_PARAMETER); + send_echo (orb.in (), server.in (), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (timeout_count == 0) @@ -263,7 +263,7 @@ int main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "In time = %d, timed out = %d\n", in_time_count, timeout_count)); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 7678b8438b5..3d3109929b8 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -40,14 +40,14 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -56,21 +56,21 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -88,10 +88,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index bbf564047ba..626d3d966a1 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) CORBA::Long Simple_Server_i::echo (CORBA::Long x, CORBA::Long msecs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000); @@ -30,10 +30,10 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h index fcc74c77fab..78b4c9015fd 100644 --- a/TAO/tests/Timeout/test_i.h +++ b/TAO/tests/Timeout/test_i.h @@ -33,9 +33,9 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, CORBA::Long msecs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp index 08e22cbe995..6e0c6e2c465 100644 --- a/TAO/tests/Two_Objects/First_i.cpp +++ b/TAO/tests/Two_Objects/First_i.cpp @@ -17,7 +17,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) } void -First_i::oneway_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +First_i::oneway_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n")); diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 58605c40548..71665113827 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -19,7 +19,7 @@ public: First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done); /// Interface methods.. - void oneway_method (TAO_ENV_SINGLE_ARG_DECL) + void oneway_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index a7d18778599..023ccf9b40f 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -18,7 +18,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len) //factory method to create first object Two_Objects_Test::First_ptr -Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL) +Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { First_i *first_impl; @@ -29,14 +29,14 @@ Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY() ); Two_Objects_Test::First_var first = - first_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER ); + first_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER ); return first._retn(); } //factory method to create second object Two_Objects_Test::Second_ptr -Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL) +Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Second_i *second_impl; @@ -47,7 +47,7 @@ Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); Two_Objects_Test::Second_var second = - second_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + second_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); return second._retn(); } diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index d49488208cf..2eab1c9966f 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -20,10 +20,10 @@ public: Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len); - Two_Objects_Test::First_ptr create_first (TAO_ENV_SINGLE_ARG_DECL) + Two_Objects_Test::First_ptr create_first (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - Two_Objects_Test::Second_ptr create_second (TAO_ENV_SINGLE_ARG_DECL) + Two_Objects_Test::Second_ptr create_second (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index a2805cc5d21..ea5ce8b464d 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -21,7 +21,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb, } Two_Objects_Test::Octet_Seq * -Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL) +Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Two_Objects_Test::Octet_Seq *preply_mesg; @@ -53,9 +53,9 @@ Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL) } void -Second_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Second_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index 073f24e877f..827d32677df 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -17,10 +17,10 @@ public: CORBA::ULong len, ACE_Auto_Event &two_way_done); Two_Objects_Test::Octet_Seq * - twoway_method (TAO_ENV_SINGLE_ARG_DECL) + twoway_method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp index 6314205f474..d93a387409a 100644 --- a/TAO/tests/Two_Objects/client.cpp +++ b/TAO/tests/Two_Objects/client.cpp @@ -37,13 +37,13 @@ int main (int argc, char *argv[]) { // Used to declare the CORBA::Environment variable - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments @@ -54,13 +54,13 @@ 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 TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to the appropriate type Two_Objects_Test::Object_Factory_var factory = Two_Objects_Test::Object_Factory::_narrow(tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -79,19 +79,19 @@ main (int argc, char *argv[]) second = factory->create_second(); // Call the oneway method - first->oneway_method (TAO_ENV_SINGLE_ARG_PARAMETER); + first->oneway_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Client : one way call done\n")); Two_Objects_Test::Octet_Seq_var reply_seq = - second->twoway_method (TAO_ENV_SINGLE_ARG_PARAMETER); + second->twoway_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Client : length of returned data is %d\n", reply_seq->length() )); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 2d9389ca115..0aab902c36d 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -62,17 +62,17 @@ main (int argc, char *argv[]) { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get initial reference to the Root POA CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to the appropriate type PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -82,7 +82,7 @@ main (int argc, char *argv[]) // Get referencee to the POA manager PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments @@ -102,13 +102,13 @@ main (int argc, char *argv[]) // _this method registers the object withe the POA and returns // an object reference Two_Objects_Test::Object_Factory_var factory = - factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // 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 () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -124,7 +124,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Activate the POA manager - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate the specified # of worker threads @@ -141,10 +141,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index a0c0d58c9f8..9b75ea5a884 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -14,14 +14,14 @@ Worker::Worker (CORBA::ORB_ptr orb, int time) int Worker::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_Time_Value tv (timeout_); ///orb times out after <timeout> seconds - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h index 0d116185253..e39fb418d95 100644 --- a/TAO/tests/Xt_Stopwatch/Client.h +++ b/TAO/tests/Xt_Stopwatch/Client.h @@ -49,7 +49,7 @@ public: // Adds the callbacks to the GUI underneath..... void parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index 58c06433cbd..f40fe31f222 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -38,17 +38,17 @@ main (int argc, char *argv[]) Control control (toplevel); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client client (orb.in ()); - client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER); + client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client.add_callback (control); @@ -79,7 +79,7 @@ Client::~Client (void) void Client::parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *ior = "file://test.ior"; @@ -102,11 +102,11 @@ Client::parse_args (int argc, } CORBA::Object_var object = - this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->server_ = - Stopwatch::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(this->server_.in ())) @@ -157,10 +157,10 @@ Client::stop_callback (Widget /*widget*/, void Client::start_hook (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->server_->start (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -175,10 +175,10 @@ Client::start_hook (void) void Client::stop_hook (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->server_->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index 984aa6b5304..b02fa3f9951 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -72,16 +72,16 @@ main (int argc, char *argv[]) Stopwatch_display stopwatch (toplevel); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; stopwatch.manage (); @@ -105,11 +105,11 @@ main (int argc, char *argv[]) Stopwatch_imp server_impl (orb.in (), &timer); Stopwatch_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -127,7 +127,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; XtRealizeWidget (toplevel); diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index 4b42f8473db..e224eb939df 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -17,21 +17,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) } void -Stopwatch_imp::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->start (); } void -Stopwatch_imp::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->stop (); } void -Stopwatch_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h index 550d3c2390d..1450ca0a48b 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.h +++ b/TAO/tests/Xt_Stopwatch/test_i.h @@ -34,13 +34,13 @@ public: // ctor // = The Simple_Server methods. - void start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/ior_corbaloc/client.cpp b/TAO/tests/ior_corbaloc/client.cpp index 023165f06f0..d88cef1f264 100644 --- a/TAO/tests/ior_corbaloc/client.cpp +++ b/TAO/tests/ior_corbaloc/client.cpp @@ -23,7 +23,7 @@ int main (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -31,12 +31,12 @@ int main (int argc, char *argv []) IOR_corbaloc_Client_i client; int init_result; - init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER); + init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result == 0) { - client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } return 0; diff --git a/TAO/tests/ior_corbaloc/corbaname_client.cpp b/TAO/tests/ior_corbaloc/corbaname_client.cpp index c240ebce76a..03cae419d01 100644 --- a/TAO/tests/ior_corbaloc/corbaname_client.cpp +++ b/TAO/tests/ior_corbaloc/corbaname_client.cpp @@ -18,7 +18,7 @@ int main (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -27,7 +27,7 @@ int main (int argc, char *argv []) CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if(argc < 2 ) { @@ -40,12 +40,12 @@ int main (int argc, char *argv []) // Get an object reference using a corbaname: style URL CORBA::Object_var obj = orb->string_to_object (argv[1] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow corbaloc::Status_var factory = - corbaloc::Status::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + corbaloc::Status::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -58,7 +58,7 @@ int main (int argc, char *argv []) // Invoke a request on the server CORBA::Boolean ret_value = - factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER); + factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value != 0) diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp index 7b81ae125a2..e00481deee0 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -33,7 +33,7 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void) } int -IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) +IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -45,13 +45,13 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) // Resolve the name CORBA::Object_var factory_object = - this->naming_context_->resolve (name TAO_ENV_ARG_PARAMETER); + this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow corbaloc::Status_var factory = corbaloc::Status::_narrow (factory_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -64,7 +64,7 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) // Invoke a request on the server CORBA::Boolean ret_value = - factory->print_status (TAO_ENV_ARG_PARAMETER); + factory->print_status (ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value != 0) @@ -95,7 +95,7 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) int IOR_corbaloc_Client_i::init (int& argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY @@ -106,7 +106,7 @@ IOR_corbaloc_Client_i::init (int& argc, CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if(argc < 2){ ACE_DEBUG((LM_DEBUG, "\nUsage:\n %s [corbaloc URL for NameService]\n", argv[0])); @@ -118,7 +118,7 @@ IOR_corbaloc_Client_i::init (int& argc, // Get a reference to the Naming Service CORBA::Object_var naming_context_object = orb->string_to_object (corbaloc_url_.c_str() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_context_object.in ())) @@ -129,7 +129,7 @@ IOR_corbaloc_Client_i::init (int& argc, // Narrow to get the correct reference this->naming_context_ = CosNaming::NamingContextExt::_narrow (naming_context_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->naming_context_.in ())) diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h index f785eb1dd80..060c38d1a77 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h @@ -39,10 +39,10 @@ class IOR_corbaloc_Client_i IOR_corbaloc_Client_i (void); ~IOR_corbaloc_Client_i (void); - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Execute the client example code. - int init (int& argc, char *argv[] TAO_ENV_ARG_DECL_WITH_DEFAULTS); + int init (int& argc, char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Initialize the client communication endpoint with the server. private: diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp index 8dfc85c305b..4396c20085e 100644 --- a/TAO/tests/ior_corbaloc/server.cpp +++ b/TAO/tests/ior_corbaloc/server.cpp @@ -10,7 +10,7 @@ int main (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -18,7 +18,7 @@ int main (int argc, char* argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if(argc < 2){ @@ -27,21 +27,21 @@ int main (int argc, char* argv[]) } // Get a reference to the RootPOA CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // narrow down to the correct reference PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set a POA Manager PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA Manager - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the servant @@ -54,13 +54,13 @@ int main (int argc, char* argv[]) // Get a reference to Naming Context CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down the reference CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_context_object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind Iterator_Factory to the Naming Context @@ -72,13 +72,13 @@ int main (int argc, char* argv[]) ACE_TRY_CHECK; // Run the orb - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, ex) { diff --git a/TAO/tests/ior_corbaloc/status_i.cpp b/TAO/tests/ior_corbaloc/status_i.cpp index d645e7c0170..d0a9207c320 100644 --- a/TAO/tests/ior_corbaloc/status_i.cpp +++ b/TAO/tests/ior_corbaloc/status_i.cpp @@ -2,14 +2,14 @@ #include "status_i.h" -corbaloc_Status_i::corbaloc_Status_i (TAO_ENV_ARG_DECL_NOT_USED) +corbaloc_Status_i::corbaloc_Status_i (ACE_ENV_ARG_DECL_NOT_USED) : server_name_() { // Constructor } CORBA::Boolean -corbaloc_Status_i::print_status (TAO_ENV_ARG_DECL_NOT_USED) +corbaloc_Status_i::print_status (ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/ior_corbaloc/status_i.h b/TAO/tests/ior_corbaloc/status_i.h index cc197646643..0c06fa8cc6d 100644 --- a/TAO/tests/ior_corbaloc/status_i.h +++ b/TAO/tests/ior_corbaloc/status_i.h @@ -9,9 +9,9 @@ class corbaloc_Status_i : public POA_corbaloc::Status { public: - corbaloc_Status_i (TAO_ENV_ARG_DECL_WITH_DEFAULTS); + corbaloc_Status_i (ACE_ENV_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean print_status (TAO_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean print_status (ACE_ENV_ARG_DECL_WITH_DEFAULTS) throw (CORBA::SystemException); void set_name(const char *name){ server_name_=name; } |