1 files changed, 16 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 353f3d5e4a0..682a8e857fb 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
       //
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -28,19 +28,19 @@ main (int argc, char *argv[])
       //
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () 
-                                      TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ()
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Get a reference to the server.
       //
       obj = orb->string_to_object ("file://server.ior"
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
       //
       server_var server_obj =
         server::_narrow (obj.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_obj.in ()))
@@ -75,47 +75,47 @@ main (int argc, char *argv[])
                       -1);
       PortableServer::ServantBase_var theClient = servant;
 
-      client_var client_ref = servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_var client_ref = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Activate the POA manager.
       //
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Set the server's callback and invoke the test request.
       //
       server_obj->set_client (client_ref.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_obj->test_request ("first secure callback to client"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Repeat the callback test.
       //
-      server_obj->set_client (client_ref.in () TAO_ENV_ARG_PARAMETER);
+      server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       server_obj->test_request ("second secure callback to client"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server_obj->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa->destroy (1, 1
-                    TAO_ENV_ARG_PARAMETER);
+                    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