summaryrefslogtreecommitdiff
path: root/TAO/tests/MT_Timeout/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/MT_Timeout/server.cpp')
-rw-r--r--TAO/tests/MT_Timeout/server.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 2b60e0c130d..0f95a9e7194 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
Test::Sleep_Service_var process =
- sleep_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
Server_Task server_task (ACE_Thread_Manager::instance (),
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY