diff options
Diffstat (limited to 'TAO/tests/POA/Identity/Identity.cpp')
-rw-r--r-- | TAO/tests/POA/Identity/Identity.cpp | 470 |
1 files changed, 235 insertions, 235 deletions
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index e1a949eda57..4a9fec96cce 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 (CORBA::Environment &) + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -46,76 +46,76 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POA_out first_poa, PortableServer::POA_out second_poa, PortableServer::POA_out third_poa, - PortableServer::POA_out forth_poa, - CORBA::Environment &ACE_TRY_ENV) + PortableServer::POA_out forth_poa + TAO_ENV_ARG_DECL) { // Policies for the new POAs CORBA::PolicyList policies (3); policies.length (3); - policies[0] = root_poa->create_lifespan_policy (lifespan_policy, - ACE_TRY_ENV); + policies[0] = root_poa->create_lifespan_policy (lifespan_policy + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, - ACE_TRY_ENV); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID, - ACE_TRY_ENV); + policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the firstPOA ACE_CString name = "firstPOA"; first_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - policies[1]->destroy (ACE_TRY_ENV); + policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID, - ACE_TRY_ENV); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the secondPOA name = "secondPOA"; second_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - policies[2]->destroy (ACE_TRY_ENV); + policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the thirdPOA name = "thirdPOA"; third_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - policies[1]->destroy (ACE_TRY_ENV); + policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, - ACE_TRY_ENV); + policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Creation of the forthPOA name = "forthPOA"; forth_poa = root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), - policies, - ACE_TRY_ENV); + policies + TAO_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 (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -135,49 +135,49 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::POA_ptr second_poa, PortableServer::POA_ptr third_poa, PortableServer::POA_ptr forth_poa, - int perform_deactivation_test, - CORBA::Environment &ACE_TRY_ENV) + int perform_deactivation_test + TAO_ENV_ARG_DECL) { { test_i servant (root_poa); - CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0", - ACE_TRY_ENV); + CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in (), - ACE_TRY_ENV); + PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; root_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - obj = root_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + obj = root_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + root_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = - root_poa->id_to_servant (id.in (), - ACE_TRY_ENV); + root_poa->id_to_servant (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -188,50 +188,50 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = root_poa->servant_to_reference (&servant, - ACE_TRY_ENV); + obj = root_poa->servant_to_reference (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_TRY_ENV); + obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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, - ACE_TRY_ENV); + PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); - root_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + root_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { root_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - servant_from_reference = root_poa->reference_to_servant (obj.in (), - ACE_TRY_ENV); + servant_from_reference = root_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); - root_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + root_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -239,76 +239,76 @@ test_poas (CORBA::ORB_ptr orb, { test_i servant (root_poa); - PortableServer::ObjectId_var id = root_poa->activate_object (&servant, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = root_poa->activate_object (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var obj = root_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + CORBA::Object_var obj = root_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_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", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - root_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + root_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } { test_i servant (first_poa); - CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0", - ACE_TRY_ENV); + CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in (), - ACE_TRY_ENV); + PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; first_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - obj = first_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + obj = first_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + first_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = - first_poa->id_to_servant (id.in (), - ACE_TRY_ENV); + first_poa->id_to_servant (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -319,25 +319,25 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - first_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + first_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { first_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - servant_from_reference = first_poa->reference_to_servant (obj.in (), - ACE_TRY_ENV); + servant_from_reference = first_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); - first_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + first_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -345,76 +345,76 @@ test_poas (CORBA::ORB_ptr orb, { test_i servant (first_poa); - PortableServer::ObjectId_var id = first_poa->activate_object (&servant, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = first_poa->activate_object (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var obj = first_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + CORBA::Object_var obj = first_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_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", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - first_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + first_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } { test_i servant (second_poa); - CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0", - ACE_TRY_ENV); + CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in (), - ACE_TRY_ENV); + PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; second_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - obj = second_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + obj = second_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + second_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = - second_poa->id_to_servant (id.in (), - ACE_TRY_ENV); + second_poa->id_to_servant (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -425,50 +425,50 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = second_poa->servant_to_reference (&servant, - ACE_TRY_ENV); + obj = second_poa->servant_to_reference (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_TRY_ENV); + obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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, - ACE_TRY_ENV); + PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); - second_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + second_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { second_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - servant_from_reference = second_poa->reference_to_servant (obj.in (), - ACE_TRY_ENV); + servant_from_reference = second_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); - second_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + second_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -476,33 +476,33 @@ test_poas (CORBA::ORB_ptr orb, { test_i servant (second_poa); - PortableServer::ObjectId_var id = second_poa->activate_object (&servant, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = second_poa->activate_object (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var obj = second_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + CORBA::Object_var obj = second_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_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", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - second_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + second_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -511,18 +511,18 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello"); CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (), - "IDL:test:1.0", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); @@ -531,28 +531,28 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_reference.in () == id.in ()); third_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - obj = third_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + obj = third_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + third_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = - third_poa->id_to_servant (id.in (), - ACE_TRY_ENV); + third_poa->id_to_servant (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -563,27 +563,27 @@ test_poas (CORBA::ORB_ptr orb, "servant_from_id and &servant\n")); } - obj = third_poa->servant_to_reference (&servant, - ACE_TRY_ENV); + obj = third_poa->servant_to_reference (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_TRY_ENV); + obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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, - ACE_TRY_ENV); + PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_servant.in ()); @@ -591,25 +591,25 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_servant.in () == id.in ()); - third_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + third_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (perform_deactivation_test) { third_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - servant_from_reference = third_poa->reference_to_servant (obj.in (), - ACE_TRY_ENV); + servant_from_reference = third_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); - third_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + third_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -619,18 +619,18 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello"); CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (), - "IDL:test:1.0", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + CORBA::String_var string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); @@ -639,28 +639,28 @@ test_poas (CORBA::ORB_ptr orb, ACE_ASSERT (id_from_reference.in () == id.in ()); forth_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - obj = forth_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + obj = forth_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - string = orb->object_to_string (obj.in (), - ACE_TRY_ENV); + string = orb->object_to_string (obj.in () + TAO_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 (), - ACE_TRY_ENV); + forth_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::Servant servant_from_id = - forth_poa->id_to_servant (id.in (), - ACE_TRY_ENV); + forth_poa->id_to_servant (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (servant_from_reference != servant_from_id @@ -676,18 +676,18 @@ test_poas (CORBA::ORB_ptr orb, if (perform_deactivation_test) { forth_poa->activate_object_with_id (id.in (), - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - servant_from_reference = forth_poa->reference_to_servant (obj.in (), - ACE_TRY_ENV); + servant_from_reference = forth_poa->reference_to_servant (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (servant_from_reference == &servant); - forth_poa->deactivate_object (id.in (), - ACE_TRY_ENV); + forth_poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -696,22 +696,22 @@ test_poas (CORBA::ORB_ptr orb, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, - ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters @@ -729,8 +729,8 @@ main (int argc, char **argv) first_poa.out (), second_poa.out (), third_poa.out (), - forth_poa.out (), - ACE_TRY_ENV); + forth_poa.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_poas (orb.in (), @@ -739,28 +739,28 @@ main (int argc, char **argv) second_poa.in (), third_poa.in (), forth_poa.in (), - perform_deactivation_test, - ACE_TRY_ENV); + perform_deactivation_test + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; third_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; forth_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; create_poas (root_poa.in (), @@ -768,8 +768,8 @@ main (int argc, char **argv) first_poa.out (), second_poa.out (), third_poa.out (), - forth_poa.out (), - ACE_TRY_ENV); + forth_poa.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_poas (orb.in (), @@ -778,13 +778,13 @@ main (int argc, char **argv) second_poa.in (), third_poa.in (), forth_poa.in (), - perform_deactivation_test, - ACE_TRY_ENV); + perform_deactivation_test + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |