diff options
Diffstat (limited to 'TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp')
| -rw-r--r-- | TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index fbd12fa1eb4..d6147cbaae3 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -242,8 +242,8 @@ private: }; void -child_poa_testing (PortableServer::POA_ptr root_poa, - CORBA::Environment &ACE_TRY_ENV) +child_poa_testing (PortableServer::POA_ptr root_poa + TAO_ENV_ARG_DECL) { // Policies for the child POA. CORBA::PolicyList policies (1); @@ -251,16 +251,16 @@ child_poa_testing (PortableServer::POA_ptr root_poa, // Id Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + root_poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the child POA under the RootPOA. PortableServer::POA_var child_poa = root_poa->create_POA ("child POA", PortableServer::POAManager::_nil (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create an array of servants @@ -298,8 +298,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa, objects[i] = child_poa->create_reference_with_id (object_ids[i].in (), - "IDL:test:1.0", - ACE_TRY_ENV); + "IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -313,8 +313,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa, for (i = 0; i < iterations; i++) { child_poa->activate_object_with_id (object_ids[i].in (), - &servants[i], - ACE_TRY_ENV); + &servants[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -327,8 +327,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa, for (i = 0; i < iterations; i++) { - child_poa->deactivate_object (object_ids[i].in (), - ACE_TRY_ENV); + child_poa->deactivate_object (object_ids[i].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -342,15 +342,15 @@ child_poa_testing (PortableServer::POA_ptr root_poa, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -358,14 +358,14 @@ main (int argc, char **argv) return result; // Obtain the RootPOA. - CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an array of servants @@ -395,7 +395,7 @@ main (int argc, char **argv) for (i = 0; i < iterations; i++) { - objects[i] = servants[i]._this (ACE_TRY_ENV); + objects[i] = servants[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -407,21 +407,21 @@ main (int argc, char **argv) for (i = 0; i < iterations; i++) { - object_ids[i] = root_poa->servant_to_id (&servants[i], - ACE_TRY_ENV); + object_ids[i] = root_poa->servant_to_id (&servants[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } // Create the child POA. - child_poa_testing (root_poa.in (), - ACE_TRY_ENV); + child_poa_testing (root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy RootPOA. root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Cleanup |