1 files changed, 13 insertions, 13 deletions

diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index a8b55d47f0b..32a7b694eaa 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -44,7 +44,7 @@ TimeoutClient::svc ()
 {
   this->initialize ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -61,14 +61,14 @@ TimeoutClient::svc ()
       this->none_test ();
 
       // shut down remote ORB
-      timeoutObject_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw
       ACE_OS::sleep (tv);
 
       // shut down local ORB
-      orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -87,16 +87,16 @@ TimeoutClient::svc ()
 int
 TimeoutClient::initialize ()
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var object =
         orb_->resolve_initial_references ("ORBPolicyManager"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -131,7 +131,7 @@ TimeoutClient::send (CORBA::Boolean async,
 
   CORBA::PolicyList policy_list (1);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_EX (normal)
     {
       if (local_timeout != 0)
@@ -145,12 +145,12 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list[0] =
             orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                  any_orb
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
 
           policy_manager_->set_policy_overrides (policy_list,
                                                  CORBA::SET_OVERRIDE
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
       else
@@ -158,7 +158,7 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list.length (0);
           policy_manager_->set_policy_overrides (policy_list,
                                                  CORBA::SET_OVERRIDE
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
 
@@ -170,12 +170,12 @@ TimeoutClient::send (CORBA::Boolean async,
         {
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
                                                 remote_sleep
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
         }
       else // synch
         {
           timeoutObject_->sendTimeToWait (remote_sleep
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK_EX (normal);
     }
@@ -196,7 +196,7 @@ TimeoutClient::send (CORBA::Boolean async,
     {
       if (local_timeout != 0)
         {
-          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (cleanup);
         }
     }