diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 181e9df512d..1a99d53e0f2 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } void -client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) +client_test (Test_ptr server TAO_ENV_ARG_DECL) { // Currently, there are only four scenarios for the client side // tests. @@ -56,7 +56,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - server->client_test (i, ACE_TRY_ENV); + server->client_test (i TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -89,7 +89,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) } void -server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) +server_test (Test_ptr server TAO_ENV_ARG_DECL) { // Currently, there are only four scenarios for the server side // tests. @@ -104,7 +104,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - server->server_test (i, ACE_TRY_ENV); + server->server_test (i TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -139,7 +139,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -151,25 +151,25 @@ 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, - "Client ORB", - ACE_TRY_ENV); + "Client ORB" + 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_var server = - Test::_narrow (object.in (), ACE_TRY_ENV); + Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -180,13 +180,13 @@ main (int argc, char *argv[]) 1); } - ::client_test (server.in (), ACE_TRY_ENV); + ::client_test (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ::server_test (server.in (), ACE_TRY_ENV); + ::server_test (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |