diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/performance-tests/POA/Implicit_Activation/collocated.cpp | |
parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/performance-tests/POA/Implicit_Activation/collocated.cpp')
-rw-r--r-- | TAO/performance-tests/POA/Implicit_Activation/collocated.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 5a2d5ab1793..2a62b297e31 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-i <niterations> " + "-i <niterations> " "-h " "\n", argv [0]), @@ -72,11 +72,11 @@ 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 ())) @@ -85,14 +85,14 @@ 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) @@ -118,8 +118,8 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(simple_impl); - references[i] = - simple_impl->_this (ACE_TRY_ENV); + references[i] = + simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -143,7 +143,7 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = ACE_OS::gethrtime (); - references[j]->destroy (ACE_TRY_ENV); + references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -160,10 +160,10 @@ main (int argc, char *argv[]) destruction.collect_basic_stats (destruction_stats); destruction_stats.dump_results ("Destruction", gsf); - 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 |