diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Simple_Naming/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Simple_Naming/client.cpp | 352 |
1 files changed, 176 insertions, 176 deletions
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 11c303e6fd9..12b1ff7e0c2 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, CORBA::Environment &ACE_TRY_ENV) + void id (CORBA::Short id TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets id. - CORBA::Short id (CORBA::Environment &ACE_TRY_ENV) + CORBA::Short id (TAO_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 (CORBA::Environment &) +My_Test_Object::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void -My_Test_Object::id (CORBA::Short id, CORBA::Environment &) +My_Test_Object::id (CORBA::Short id TAO_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; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize ORB. this->orbmgr_.init (this->argc_, - this->argv_, - ACE_TRY_ENV); + this->argv_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orbmgr_.activate_poa_manager (ACE_TRY_ENV); + this->orbmgr_.activate_poa_manager (TAO_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; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY_EX (SETUP) { CORBA::Object_var name_service_obj = - orb_->string_to_object (name_service_ior_, ACE_TRY_ENV); + orb_->string_to_object (name_service_ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); name_service = - CosNaming::NamingContext::_narrow (name_service_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (name_service_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); } ACE_CATCHANY @@ -277,8 +277,8 @@ MT_Test::svc (void) ACE_TRY_EX (BIND) { name_service->bind (test_name_, - test_ref_.in (), - ACE_TRY_ENV); + test_ref_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (BIND); ACE_DEBUG ((LM_DEBUG, "Bound name OK in thread %t\n")); @@ -305,18 +305,18 @@ MT_Test::svc (void) ACE_TRY_EX (RESOLVE) { CORBA::Object_var result_obj_ref = - name_service->resolve (test_name_, - ACE_TRY_ENV); + name_service->resolve (test_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (id == CosNaming_Client::OBJ1_ID) @@ -340,8 +340,8 @@ MT_Test::svc (void) // Unbind the object from the Naming Context. ACE_TRY_EX (UNBIND) { - name_service->unbind (test_name_, - ACE_TRY_ENV); + name_service->unbind (test_name_ + TAO_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); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { test_ref_ = - test_obj_impl->_this (ACE_TRY_ENV); + test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_obj_impl->_remove_ref (ACE_TRY_ENV); + test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the Naming Service. Each thread can use it @@ -394,8 +394,8 @@ MT_Test::execute (TAO_Naming_Client &root_context) root_context.get_context (); name_service_ior_ = - orb_->object_to_string (context.in (), - ACE_TRY_ENV); + orb_->object_to_string (context.in () + TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_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 (ACE_TRY_ENV); + test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Give ownership of this object to POA. - test_obj_impl->_remove_ref (ACE_TRY_ENV); + test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind an object to the Naming Context. @@ -443,32 +443,32 @@ Simple_Test::execute (TAO_Naming_Client &root_context) test_name.length (1); test_name[0].id = CORBA::string_dup ("Foo"); root_context->bind (test_name, - test_obj_ref.in (), - ACE_TRY_ENV); + test_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Bound name OK\n")); // Resolve the object from the Naming Context. CORBA::Object_var result_obj_ref = - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id == CosNaming_Client::OBJ1_ID) ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n")); } // Unbind the object from the Naming Context. - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a tree of contexts: root->level1->level2. Bind object @@ -498,28 +498,28 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level1.length (1); level1[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; - level1_context = root_context->bind_new_context (level1, - ACE_TRY_ENV); + level1_context = root_context->bind_new_context (level1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a new context. CosNaming::NamingContext_var level2_context; - level2_context = root_context->new_context (ACE_TRY_ENV); + level2_context = root_context->new_context (TAO_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 (ACE_TRY_ENV); + Test_Object_var obj1 = impl1->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl1->_remove_ref (ACE_TRY_ENV); + impl1->_remove_ref (TAO_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 (), - ACE_TRY_ENV); + level2_context->bind (obj_name, obj1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind the context we just created under level1. @@ -527,8 +527,8 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level2.length (2); level2[1].id = CORBA::string_dup ("level2_context"); root_context->bind_context (level2, - level2_context.in (), - ACE_TRY_ENV); + level2_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve and unbind level1/level2/foo, and bind it back. @@ -536,12 +536,12 @@ Tree_Test::execute (TAO_Naming_Client &root_context) test_name.length (3); test_name[2].id = obj_name[0].id; CORBA::Object_var result_obj_ref = - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_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 (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id != CosNaming_Client::OBJ1_ID) @@ -559,37 +559,37 @@ 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, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj1.in (), - ACE_TRY_ENV); + obj1.in () + TAO_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 (ACE_TRY_ENV); + root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind_context (level2, - new_level2_context.in (), - ACE_TRY_ENV); + new_level2_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind, resolve, rebind, and resolve foo under level1/level2. root_context->bind (test_name, - obj1.in (), - ACE_TRY_ENV); + obj1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_obj_ref = root_context->resolve (test_name, - ACE_TRY_ENV); + result_obj_ref = root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_object = Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + result_object = Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Short obj_id = result_object->id (ACE_TRY_ENV); + CORBA::Short obj_id = result_object->id (TAO_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 (ACE_TRY_ENV); + Test_Object_var obj2 = impl2->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl2->_remove_ref (ACE_TRY_ENV); + impl2->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind (test_name, - obj2.in (), - ACE_TRY_ENV); + obj2.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_obj_ref = root_context->resolve (test_name, - ACE_TRY_ENV); + result_obj_ref = root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_object = Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + result_object = Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj_id = result_object->id (ACE_TRY_ENV); + obj_id = result_object->id (TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Set things up. @@ -654,56 +654,56 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) context_name.length (1); context_name[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; - level1_context = root_context->bind_new_context (context_name, - ACE_TRY_ENV); + level1_context = root_context->bind_new_context (context_name + TAO_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, - ACE_TRY_ENV); + level2_context = level1_context->bind_new_context (context_name + TAO_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 (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; object_name.length (1); object_name[0].id = CORBA::string_dup ("foo"); root_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level1_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level2_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run exceptions tests. - invalid_name_test (root_context, - ACE_TRY_ENV); + invalid_name_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - already_bound_test (root_context, - ACE_TRY_ENV); + already_bound_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - already_bound_test2 (root_context, - ACE_TRY_ENV); + already_bound_test2 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test (root_context, - ACE_TRY_ENV); + not_found_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test2 (root_context, - ACE_TRY_ENV); + not_found_test2 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test3 (root_context, - ACE_TRY_ENV); + not_found_test3 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -718,16 +718,16 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) } void -Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { CosNaming::Name test_name; test_name.length (0); - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n")); } @@ -746,8 +746,8 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context + TAO_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 (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n")); } @@ -782,8 +782,8 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context + TAO_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 (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n")); } @@ -818,8 +818,8 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -829,8 +829,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, test_name[1].id = CORBA::string_dup ("level2_context"); test_name[2].id = CORBA::string_dup ("bar"); - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Not found test failed\n")); } @@ -857,8 +857,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -868,8 +868,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, test_name[1].id = CORBA::string_dup ("level3_context"); test_name[2].id = CORBA::string_dup ("foo"); - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n")); } @@ -899,8 +899,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context + TAO_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, ACE_TRY_ENV); + root_context->unbind (test_name TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Instantiate four dummy objects. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind objects to the naming context. @@ -965,20 +965,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) name4.length (1); name4[0].id = CORBA::string_dup ("foo4"); root_context->bind (name1, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name2, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name3, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name4, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // List the content of the Naming Context. @@ -986,8 +986,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) CosNaming::BindingList_var bindings_list; root_context->list (1, bindings_list.out (), - iter.out (), - ACE_TRY_ENV); + iter.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (iter.in ()) || bindings_list->length () != 1 @@ -1001,8 +1001,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) // Invoke operations on the iterator. CosNaming::Binding_var binding; - iter->next_one (binding.out (), - ACE_TRY_ENV); + iter->next_one (binding.out () + TAO_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 (), ACE_TRY_ENV); + iter->next_n (2, bindings_list.out () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (bindings_list->length () != 2 || bindings_list[0u].binding_type != CosNaming::nobject @@ -1028,14 +1028,14 @@ 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 (), - ACE_TRY_ENV); + CORBA::Boolean result = iter->next_one (binding.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) ACE_ERROR_RETURN ((LM_ERROR, "CosNaming::BindingIterator does not function properly\n"), -1); - iter->destroy (ACE_TRY_ENV); + iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1052,42 +1052,42 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) int Destroy_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a context and bind an object under it. CosNaming::NamingContext_var my_context; - my_context = root_context->new_context (ACE_TRY_ENV); + my_context = root_context->new_context (TAO_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 (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; object_name.length (1); object_name[0].id = CORBA::string_dup ("foo"); my_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Do the testing. - not_empty_test (my_context, - ACE_TRY_ENV); + not_empty_test (my_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->unbind (object_name, ACE_TRY_ENV); + my_context->unbind (object_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->destroy (ACE_TRY_ENV); + my_context->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - not_exist_test (my_context, - ACE_TRY_ENV); + not_exist_test (my_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1103,12 +1103,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context) } void -Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV) +Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (ACE_TRY_ENV); + ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1122,12 +1122,12 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref, } void -Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV) +Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (ACE_TRY_ENV); + ref->destroy (TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a name structure we will reuse. @@ -1164,20 +1164,20 @@ 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, - ACE_TRY_ENV); + root_context->bind_new_context (test_name + TAO_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, - ACE_TRY_ENV); + level1_context->bind_new_context (test_name + TAO_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 (), ACE_TRY_ENV); + orb_->object_to_string (level1_context.in () TAO_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) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_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_, ACE_TRY_ENV); + orb_->string_to_object (ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var level1_context = - CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (obj.in () TAO_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, ACE_TRY_ENV); + obj = level1_context->resolve (test_name TAO_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, ACE_TRY_ENV); + root_context->resolve (test_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Make sure we got the same answer through both methods. |