diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp index 870ca870754..3a068ab08cb 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp @@ -73,7 +73,7 @@ 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; if (parse_args (argc, argv) != 0) @@ -81,12 +81,12 @@ int main (int argc, char *argv[]) // Get the event channel object reference CORBA::Object_var coordinator_object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Control::Coordinator_var coordinator = - Control::Coordinator::_narrow (coordinator_object.in (), - ACE_TRY_ENV); + Control::Coordinator::_narrow (coordinator_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -97,13 +97,13 @@ int main (int argc, char *argv[]) } 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; @@ -113,20 +113,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 ())) @@ -135,32 +135,32 @@ 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; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (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; Servant_var<ECFS_Peer> peer_impl (new ECFS_Peer (orb.in ())); - peer_impl->init (root_poa.in (), ACE_TRY_ENV); + peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Control::Peer_var peer (peer_impl->_this (ACE_TRY_ENV)); + Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; - coordinator->join (peer.in (), ACE_TRY_ENV); + coordinator->join (peer.in () TAO_ENV_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")); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |