From b11770b30f8b58d20fe2d61846bfa3fc5354ee7e Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Sat, 8 Dec 2001 21:59:30 +0000 Subject: Merged corba-env-clean branch. --- TAO/tests/Portable_Interceptors/Dynamic/client.cpp | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'TAO/tests/Portable_Interceptors/Dynamic/client.cpp') diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index edb75f81cb8..d725bb1c6d7 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server, - CORBA::Environment &ACE_TRY_ENV) +run_test (Test_Interceptors::Visual_ptr server + TAO_ENV_ARG_DECL) { - server->normal (10, ACE_TRY_ENV); + server->normal (10 TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, - two, - ACE_TRY_ENV); + two + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -57,7 +57,7 @@ run_test (Test_Interceptors::Visual_ptr server, ACE_TRY { - server->user (ACE_TRY_ENV); + server->user (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test_Interceptors::Silly, userex) @@ -69,7 +69,7 @@ run_test (Test_Interceptors::Visual_ptr server, ACE_TRY_EX (SYS) { - server->system (ACE_TRY_ENV); + server->system (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -93,23 +93,23 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (orb_initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; 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) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in (), ACE_TRY_ENV); + Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -120,9 +120,9 @@ main (int argc, char *argv[]) 1); } - run_test (server.in (), ACE_TRY_ENV); + run_test (server.in () TAO_ENV_ARG_PARAMETER); - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY -- cgit v1.2.1