diff options
author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
---|---|---|
committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
commit | 15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8 (patch) | |
tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp | |
parent | 5e12d6686388ccadee1714b94ddee0cce6587bfd (diff) | |
download | ATCD-15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8.tar.gz |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp')
-rw-r--r-- | TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 5f1a1aac394..b5c19048de3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -43,7 +43,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_ORBInitializer *temp_initializer = 0; @@ -54,15 +54,15 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "Server ORB" 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; if (CORBA::is_nil (poa_object.in ())) @@ -71,11 +71,11 @@ main (int argc, char *argv[]) 1); 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; 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) @@ -83,18 +83,18 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", ior.in ())); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Write IOR to a file. @@ -109,13 +109,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - 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_DEBUG ((LM_DEBUG, "Event loop finished.\n")); |