3 files changed, 20 insertions, 20 deletions

diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index 241d420cd47..a28cdc05848 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -35,27 +35,27 @@ MyFooServant::~MyFooServant (void)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 CORBA::Long
-MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-MyFooServant::simply_doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::simply_doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 MyFooServant::timed_operation (CORBA::ULong timeout
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -69,10 +69,10 @@ MyFooServant::timed_operation (CORBA::ULong timeout
 }
 
 void
-MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+MyFooServant::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index e3b14fceeda..e715a747a18 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -29,23 +29,23 @@ public:
   virtual ~MyFooServant (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
   // Returns the Default POA of this Servant object
 
-  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Simple doit method
 
-  virtual void simply_doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void simply_doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Even simpler doit method
 
   virtual void timed_operation (CORBA::ULong timeout
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Timed operation.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the ORB
 
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index 121b62356a1..16f7dd3d5a0 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -155,7 +155,7 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -163,7 +163,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -180,17 +180,17 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object = orb->string_to_object (IOR
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a Foo reference.
       Foo_var foo = Foo::_narrow (object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (foo.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -212,20 +212,20 @@ main (int argc, char **argv)
           if (oneway)
             {
               // Invoke the simply_doit() method of the foo reference.
-              foo->simply_doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+              foo->simply_doit (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (timed_operations)
             {
               // Invoke the timed_operation() method of the foo reference.
               foo->timed_operation (timeout
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               // Invoke the doit() method of the foo reference.
-              result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+              result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -239,7 +239,7 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }