diff options
Diffstat (limited to 'TAO/tests/Connection_Purging')
| -rw-r--r-- | TAO/tests/Connection_Purging/client.cpp | 16 | ||||
| -rw-r--r-- | TAO/tests/Connection_Purging/server.cpp | 20 | ||||
| -rw-r--r-- | TAO/tests/Connection_Purging/test_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Connection_Purging/test_i.h | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index 0af2e31ef87..ddd39137669 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -38,7 +38,7 @@ 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; if (parse_args (argc, argv) != 0) @@ -58,11 +58,11 @@ main (int argc, char *argv[]) { iorfile = "file://" + iorfile; CORBA::Object_var tmp = - orb->string_to_object(iorfile.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = - test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -73,14 +73,14 @@ main (int argc, char *argv[]) 1); } - test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER); + test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK // Test for LFU strategy. The transport to any other // server should be removed before the first one. if (i == 0) { - test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER); + test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK holder = test; @@ -91,7 +91,7 @@ main (int argc, char *argv[]) // removed. if (!CORBA::is_nil(holder.in ())) { - holder->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER); + holder->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK } } @@ -102,10 +102,10 @@ main (int argc, char *argv[]) } } - orb->shutdown (1 TAO_ENV_ARG_PARAMETER); + orb->shutdown (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 diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index dce725de720..0a9c8394ebf 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -38,15 +38,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 ())) @@ -55,7 +55,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) @@ -68,11 +68,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); test_var test = - test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -85,19 +85,19 @@ 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; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); delete test_impl; - 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 diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp index 9f69f9e1ec0..48b6bc7ccb1 100644 --- a/TAO/tests/Connection_Purging/test_i.cpp +++ b/TAO/tests/Connection_Purging/test_i.cpp @@ -5,7 +5,7 @@ void test_i::send_stuff (const char* string - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h index b862bd1e806..d73acbf3587 100644 --- a/TAO/tests/Connection_Purging/test_i.h +++ b/TAO/tests/Connection_Purging/test_i.h @@ -23,7 +23,7 @@ class test_i public: // = The skeleton methods virtual void send_stuff (const char* string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: |