diff options
Diffstat (limited to 'TAO/performance-tests/POA/Create_Reference/create_reference.cpp')
| -rw-r--r-- | TAO/performance-tests/POA/Create_Reference/create_reference.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 793e0ca8e70..46b6edd2b4b 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -74,8 +74,8 @@ set_rt_scheduling (void) void object_creation_test (PortableServer::POA_ptr poa, - int create_reference_with_id, - CORBA::Environment &ACE_TRY_ENV) + int create_reference_with_id + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nCreating %d object references with %s\n", @@ -101,15 +101,15 @@ object_creation_test (PortableServer::POA_ptr poa, { object = poa->create_reference_with_id (oid.in (), - "IDL:Test/Simple:1.0", - ACE_TRY_ENV); + "IDL:Test/Simple:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { object = - poa->create_reference ("IDL:Test/Simple:1.0", - ACE_TRY_ENV); + poa->create_reference ("IDL:Test/Simple:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -135,13 +135,13 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", - ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -150,15 +150,15 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -167,33 +167,33 @@ main (int argc, char *argv[]) CORBA::PolicyList policies(1); policies.length (1); 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_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("TestPOA", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; gsf = ACE_High_Res_Timer::global_scale_factor (); object_creation_test (root_poa.in (), - 0, // POA::create_reference - ACE_TRY_ENV); + 0 // POA::create_reference + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object_creation_test (child_poa.in (), - 1, // POA::create_reference_with_id - ACE_TRY_ENV); + 1 // POA::create_reference_with_id + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |