ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

10 files changed, 72 insertions, 72 deletions

diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 02c51916335..4a707034563 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -21,30 +21,30 @@ Counter_Servant::~Counter_Servant (void)
 // Counter Interface Methods Implementation.
 
 void
-Counter_Servant::increment (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::increment (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->count_;
 }
 
 CORBA::Long
-Counter_Servant::get_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::get_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->count_;
 }
 
 void
-Counter_Servant::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->count_ = 0;
 }
 
 void
-Counter_Servant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Counter_Servant::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->policy_tester_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->policy_tester_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_TRY_CHECK;
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index 2ed503217ea..503d9cd3296 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -35,16 +35,16 @@ public:
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void increment (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long get_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long get_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index e8beea4ce17..e9b672afcff 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -28,38 +28,38 @@ Policy_Tester::~Policy_Tester (void)
 }
 
 void
-Policy_Tester::run (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->child_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Policy_Tester::init (int argc,
                      char *argv[]
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // ORB Initialization.
   this->orb_ =
     CORBA::ORB_init (argc, argv, ""
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Here we parse the command line paramether passed
@@ -74,13 +74,13 @@ Policy_Tester::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -119,7 +119,7 @@ Policy_Tester::init (int argc,
     }
 
   int result =
-    this->create_objects (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -142,7 +142,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -152,7 +152,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
   poa_policy_list[0] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                                  priority
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Create priority Banded Connection Policy.
@@ -161,7 +161,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 
   poa_policy_list[1] =
     this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Client Protocol Policy.
@@ -179,11 +179,11 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->rt_orb_->create_client_protocol_policy (protocol_list);
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_mgr =
@@ -193,18 +193,18 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->poa_->create_POA ("Child_POA",
                             poa_mgr.in (),
                             poa_policy_list
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->child_poa_ =
-    RTPortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create a Corba Object reference, using the policies
   // set at the POA level.
   object =
     this->child_poa_->create_reference ("IDL:Counter:1.0"
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -214,7 +214,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
                         "Unable to create Object!\n"))
     return -1;
 
-  Counter_var base_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (base_object.in(),
@@ -222,7 +222,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     return -1;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (base_object.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -248,7 +248,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->child_poa_->create_reference_with_priority
     ("IDL:Counter:1.0",
      this->rt_object_properties_->priority ()
-     TAO_ENV_ARG_PARAMETER);
+     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -258,7 +258,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
                         "Unable to create a Counter Object!\n"))
     return -1;
 
-  Counter_var over_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (over_object.in(),
@@ -267,7 +267,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 
 
   CORBA::String_var o_ior =
-    this->orb_->object_to_string (over_object.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -286,8 +286,8 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Policy_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index 86440cb829e..d2a0047ec94 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -35,17 +35,17 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Runs the test.
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 private:
   // Helper method used internally.
-  int create_objects (TAO_ENV_SINGLE_ARG_DECL);
+  int create_objects (ACE_ENV_SINGLE_ARG_DECL);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 8d2329cfa06..ca2c68986ce 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -19,10 +19,10 @@ Policy_Verifier::~Policy_Verifier (void)
 void
 Policy_Verifier::init (int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -34,7 +34,7 @@ Policy_Verifier::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           this->priority_bands_ =
             this->rt_poa_properties_->priority_bands ().length ();
@@ -42,7 +42,7 @@ Policy_Verifier::init (int argc,
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -89,26 +89,26 @@ Policy_Verifier::init (int argc,
 
   // Get the Object references.
   CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->base_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->base_object_.in (),
                                          "Unable to convert the IOR to the proper object reference.\n"))
     return;
 
-  object = this->orb_->string_to_object (this->overridden_object_ref_ TAO_ENV_ARG_PARAMETER);
+  object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->overridden_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->overridden_object_.in (),
@@ -118,30 +118,30 @@ Policy_Verifier::init (int argc,
 }
 
 void
-Policy_Verifier::run (TAO_ENV_SINGLE_ARG_DECL )
+Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL )
 {
   this->verify_reference (this->base_object_.in (),
                           this->rt_poa_properties_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->verify_reference (this->overridden_object_.in (),
                           this->rt_object_properties_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Policy_Verifier::verify_reference (Counter_ptr object,
                                    RT_Properties *rt_properties
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
 
   ACE_TRY
     {
       CORBA::Policy_var policy_var =
         object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n"))
@@ -150,11 +150,11 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ());
 
           RTCORBA::PriorityModel priority_model =
-            priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+            priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RTCORBA::Priority priority =
-            priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+            priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (priority_model == RTCORBA::SERVER_DECLARED)
@@ -175,14 +175,14 @@ Policy_Verifier::verify_reference (Counter_ptr object,
         }
 
       policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
 
           RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy =
             RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -219,16 +219,16 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             }
         }
       policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                             "Unable to get Client Protocol Policy\n"))
         {
           RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () TAO_ENV_ARG_PARAMETER);
+            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RTCORBA::ProtocolList_var protocol_list =
-            client_protocol_policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER);
+            client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (unsigned int  i = 0; i < protocol_list->length (); i++)
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index d533a32f64a..26afd3e9540 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -40,15 +40,15 @@ public:
 
   void init (int argc,
              char *argv[]
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
   // -- Helper methods --
   void verify_reference (Counter_ptr counter,
                          RT_Properties *rt_properties
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                   const char *msg);
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index cff2300b0be..5f49c4bec7a 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -17,7 +17,7 @@ RT_Properties::~RT_Properties (void)
 
 RT_Properties *
 RT_Properties::read_from (const char *file_name
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   FILE *fp = ACE_OS::fopen (file_name, "r");
 
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 310c8c99174..35166b9d9fa 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -30,7 +30,7 @@ public:
   ~RT_Properties (void);
 
   static RT_Properties * read_from (const char *file_name
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 4859498b674..05ad6e1d8cb 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -14,16 +14,16 @@ ACE_RCSID(tao, client, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Policy_Verifier policy_verifier;
 
-      policy_verifier.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_verifier.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy_verifier.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 2903e49602e..ecc7d20d022 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -21,19 +21,19 @@ ACE_RCSID(tao, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Policy_Tester policy_tester;
 
-      int result = policy_tester.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      policy_tester.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy_tester.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }