diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp')
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp index 9145637d711..71c4b344f84 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp @@ -72,17 +72,17 @@ int 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 manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -92,20 +92,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -114,13 +114,13 @@ int main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -131,15 +131,15 @@ int main (int argc, char *argv[]) 1); PortableServer::ServantBase_var ec_owner (ec_impl); - ec_impl->activate (ACE_TRY_ENV); + ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -152,18 +152,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - 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 |