diff options
Diffstat (limited to 'TAO/tests/BiDirectional_NestedUpcall')
-rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/client.cpp | 30 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/server.cpp | 26 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/test_i.cpp | 16 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/test_i.h | 10 |
4 files changed, 41 insertions, 41 deletions
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: |