diff options
Diffstat (limited to 'TAO/tests/POA/Identity/Identity.cpp')
-rw-r--r-- | TAO/tests/POA/Identity/Identity.cpp | 244 |
1 files changed, 122 insertions, 122 deletions
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 |