diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Simple_Naming/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Simple_Naming/client.cpp | 230 |
1 files changed, 115 insertions, 115 deletions
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 233ea44feb0..1279dee82b7 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -42,11 +42,11 @@ public: // = Interface implementation accessor methods. - void id (CORBA::Short id TAO_ENV_ARG_DECL) + void id (CORBA::Short id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets id. - CORBA::Short id (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Gets id. @@ -64,14 +64,14 @@ My_Test_Object::~My_Test_Object (void) } CORBA::Short -My_Test_Object::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void -My_Test_Object::id (CORBA::Short id TAO_ENV_ARG_DECL_NOT_USED) +My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { id_ = id; @@ -206,16 +206,16 @@ CosNaming_Client::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize ORB. this->orbmgr_.init (this->argc_, this->argv_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orbmgr_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -250,16 +250,16 @@ MT_Test::svc (void) CosNaming::NamingContext_var name_service; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX (SETUP) { CORBA::Object_var name_service_obj = - orb_->string_to_object (name_service_ior_ TAO_ENV_ARG_PARAMETER); + orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); name_service = CosNaming::NamingContext::_narrow (name_service_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); } ACE_CATCHANY @@ -278,7 +278,7 @@ MT_Test::svc (void) { name_service->bind (test_name_, test_ref_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (BIND); ACE_DEBUG ((LM_DEBUG, "Bound name OK in thread %t\n")); @@ -306,17 +306,17 @@ MT_Test::svc (void) { CORBA::Object_var result_obj_ref = name_service->resolve (test_name_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (id == CosNaming_Client::OBJ1_ID) @@ -341,7 +341,7 @@ MT_Test::svc (void) ACE_TRY_EX (UNBIND) { name_service->unbind (test_name_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND); ACE_DEBUG ((LM_DEBUG, "Unbound name OK in thread %t\n")); @@ -374,14 +374,14 @@ MT_Test::execute (TAO_Naming_Client &root_context) My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { test_ref_ = - test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the Naming Service. Each thread can use it @@ -395,7 +395,7 @@ MT_Test::execute (TAO_Naming_Client &root_context) name_service_ior_ = orb_->object_to_string (context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -425,17 +425,17 @@ MT_Test::execute (TAO_Naming_Client &root_context) int Simple_Test::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Dummy object instantiation. My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID); Test_Object_var test_obj_ref = - test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Give ownership of this object to POA. - test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind an object to the Naming Context. @@ -444,7 +444,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context) test_name[0].id = CORBA::string_dup ("Foo"); root_context->bind (test_name, test_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Bound name OK\n")); @@ -452,15 +452,15 @@ Simple_Test::execute (TAO_Naming_Client &root_context) // Resolve the object from the Naming Context. CORBA::Object_var result_obj_ref = root_context->resolve (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id == CosNaming_Client::OBJ1_ID) ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n")); @@ -468,7 +468,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context) // Unbind the object from the Naming Context. root_context->unbind (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Unbound name OK\n")); @@ -487,7 +487,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context) int Tree_Test::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create a tree of contexts: root->level1->level2. Bind object @@ -499,27 +499,27 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level1[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; level1_context = root_context->bind_new_context (level1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a new context. CosNaming::NamingContext_var level2_context; - level2_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate a dummy object and bind it under the new context. My_Test_Object *impl1 = new My_Test_Object (CosNaming_Client::OBJ1_ID); - Test_Object_var obj1 = impl1->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl1->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name obj_name; obj_name.length (1); obj_name[0].id = CORBA::string_dup ("foo"); level2_context->bind (obj_name, obj1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind the context we just created under level1. @@ -528,7 +528,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level2[1].id = CORBA::string_dup ("level2_context"); root_context->bind_context (level2, level2_context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve and unbind level1/level2/foo, and bind it back. @@ -537,11 +537,11 @@ Tree_Test::execute (TAO_Naming_Client &root_context) test_name[2].id = obj_name[0].id; CORBA::Object_var result_obj_ref = root_context->resolve (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ())) @@ -549,7 +549,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context) "Problems with resolving foo in Tree Test - nil object ref.\n"), -1); - CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id != CosNaming_Client::OBJ1_ID) @@ -560,36 +560,36 @@ Tree_Test::execute (TAO_Naming_Client &root_context) // Unbind the object from the Naming Context and bind it back // in. root_context->unbind (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, obj1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create new context and rebind under the name level1/level2. CosNaming::NamingContext_var new_level2_context; new_level2_context = - root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind_context (level2, new_level2_context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind, resolve, rebind, and resolve foo under level1/level2. root_context->bind (test_name, obj1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result_obj_ref = root_context->resolve (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result_object = Test_Object::_narrow (result_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Short obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ()) @@ -600,24 +600,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context) My_Test_Object *impl2 = new My_Test_Object (CosNaming_Client::OBJ2_ID); - Test_Object_var obj2 = impl2->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl2->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind (test_name, obj2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result_obj_ref = root_context->resolve (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result_object = Test_Object::_narrow (result_obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ()) @@ -644,7 +644,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context) int Exceptions_Test::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Set things up. @@ -655,19 +655,19 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) context_name[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; level1_context = root_context->bind_new_context (context_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; context_name[0].id = CORBA::string_dup ("level2_context"); CosNaming::NamingContext_var level2_context; level2_context = level1_context->bind_new_context (context_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind a dummy object foo under each context. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; @@ -675,35 +675,35 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) object_name[0].id = CORBA::string_dup ("foo"); root_context->bind (object_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level1_context->bind (object_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level2_context->bind (object_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run exceptions tests. invalid_name_test (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; already_bound_test (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; already_bound_test2 (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; not_found_test (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; not_found_test2 (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; not_found_test3 (root_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -719,7 +719,7 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) void Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -727,7 +727,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context test_name.length (0); root_context->resolve (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n")); } @@ -747,7 +747,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context void Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -755,14 +755,14 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context test_name.length (1); test_name[0].id = CORBA::string_dup ("foo"); My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n")); } @@ -783,7 +783,7 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context void Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -792,14 +792,14 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context test_name[0].id = CORBA::string_dup ("level1_context"); test_name[1].id = CORBA::string_dup ("foo"); My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n")); } @@ -819,7 +819,7 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context void Exceptions_Test::not_found_test (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -830,7 +830,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context test_name[2].id = CORBA::string_dup ("bar"); root_context->unbind (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Not found test failed\n")); } @@ -858,7 +858,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context void Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -869,7 +869,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context test_name[2].id = CORBA::string_dup ("foo"); root_context->unbind (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n")); } @@ -900,7 +900,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context void Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -910,7 +910,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context test_name[1].id = CORBA::string_dup ("foo"); test_name[2].id = CORBA::string_dup ("foo"); - root_context->unbind (test_name TAO_ENV_ARG_PARAMETER); + root_context->unbind (test_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n")); } @@ -941,14 +941,14 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context int Iterator_Test::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Instantiate four dummy objects. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind objects to the naming context. @@ -966,19 +966,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) name4[0].id = CORBA::string_dup ("foo4"); root_context->bind (name1, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name2, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name3, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name4, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // List the content of the Naming Context. @@ -987,7 +987,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) root_context->list (1, bindings_list.out (), iter.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (iter.in ()) || bindings_list->length () != 1 @@ -1002,7 +1002,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) // Invoke operations on the iterator. CosNaming::Binding_var binding; iter->next_one (binding.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (binding->binding_type != CosNaming::nobject) ACE_ERROR_RETURN ((LM_ERROR, @@ -1012,7 +1012,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) "Second binding: %s\n", binding->binding_name[0].id.in ())); - iter->next_n (2, bindings_list.out () TAO_ENV_ARG_PARAMETER); + iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (bindings_list->length () != 2 || bindings_list[0u].binding_type != CosNaming::nobject @@ -1029,13 +1029,13 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) // We already iterated over all the bindings, so the following // should return false. CORBA::Boolean result = iter->next_one (binding.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) ACE_ERROR_RETURN ((LM_ERROR, "CosNaming::BindingIterator does not function properly\n"), -1); - iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1052,20 +1052,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) int Destroy_Test::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create a context and bind an object under it. CosNaming::NamingContext_var my_context; - my_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind a dummy object foo under my_context. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; @@ -1073,21 +1073,21 @@ Destroy_Test::execute (TAO_Naming_Client &root_context) object_name[0].id = CORBA::string_dup ("foo"); my_context->bind (object_name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Do the testing. not_empty_test (my_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->unbind (object_name TAO_ENV_ARG_PARAMETER); + my_context->unbind (object_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; not_exist_test (my_context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1104,11 +1104,11 @@ Destroy_Test::execute (TAO_Naming_Client &root_context) void Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1123,11 +1123,11 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref void Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1154,7 +1154,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void) int Persistent_Test_Begin::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create a name structure we will reuse. @@ -1165,19 +1165,19 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context) // Create and bind a naming context under the <root> context. CosNaming::NamingContext_var level1_context = root_context->bind_new_context (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create and bind a naming context under <level1> context. test_name[0].id = CORBA::string_dup ("level2"); CosNaming::NamingContext_var level2_context = level1_context->bind_new_context (test_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the ior of <level1_context> for use by <Persistent_Test_End>. CORBA::String_var ior = - orb_->object_to_string (level1_context.in () TAO_ENV_ARG_PARAMETER); + orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::fprintf (this->file_, @@ -1213,7 +1213,7 @@ Persistent_Test_End::~Persistent_Test_End (void) int Persistent_Test_End::execute (TAO_Naming_Client &root_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create a name structure we will reuse. @@ -1224,11 +1224,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // Convert stringified ior we got from <Persistent_Test_Begin> // for <level1> Naming Context to Naming Context reference. 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; CosNaming::NamingContext_var level1_context = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (level1_context.in ())) @@ -1238,7 +1238,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // Resolve for <level2> context through the persistent ior we // got from part 1 of this test. - obj = level1_context->resolve (test_name TAO_ENV_ARG_PARAMETER); + obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now, resolve for <level2> context using the <root> context @@ -1247,7 +1247,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) test_name[0].id = CORBA::string_dup ("level1"); test_name[1].id = CORBA::string_dup ("level2"); CORBA::Object_var obj2 = - root_context->resolve (test_name TAO_ENV_ARG_PARAMETER); + root_context->resolve (test_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Make sure we got the same answer through both methods. |