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

26 files changed, 161 insertions, 161 deletions

diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 011fe07d0ea..44b02a11e47 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -29,7 +29,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // @@ Use an allocator for this memory...
   PROXY **proxies = 0;
@@ -58,7 +58,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
-          worker->work (*j TAO_ENV_ARG_PARAMETER);
+          worker->work (*j ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           (*j)->_decr_refcnt ();
         }
@@ -81,42 +81,42 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_COPY_ON_READ_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 5f1b3e1e100..98578fe4fb5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -41,14 +41,14 @@ public:
 
   // = The TAO_ESF_Proxy_Collection methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 1ecba5d20e3..160bd3cabc4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -66,7 +66,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   Read_Guard ace_mon (this->mutex_,
                       this->collection_);
@@ -74,7 +74,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = ace_mon.collection->collection.end ();
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
-      worker->work (*i TAO_ENV_ARG_PARAMETER);
+      worker->work (*i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -82,7 +82,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -91,13 +91,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.connected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -106,13 +106,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -120,12 +120,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -134,7 +134,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index 8e646428cb0..52f2303f730 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -126,14 +126,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 564e6d08805..3344bc33cab 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -46,14 +46,14 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work (*i TAO_ENV_ARG_PARAMETER);
+      worker->work (*i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
   }
@@ -108,7 +108,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -118,7 +118,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
-      this->connected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -135,7 +135,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -145,7 +145,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
-      this->reconnected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -162,7 +162,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -171,7 +171,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
-      this->disconnected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -187,7 +187,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -196,7 +196,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can shutdown the object immediately
-      this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 7c28ba64540..175066320f3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -93,12 +93,12 @@ public:
   int execute_delayed_operations (void);
 
   void connected_i (PROXY *proxy
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   void reconnected_i (PROXY *proxy
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   void disconnected_i (PROXY *proxy
-                     TAO_ENV_ARG_DECL);
-  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
+  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -107,14 +107,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
index 964625575f9..7ba390a202f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
@@ -3,30 +3,30 @@
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     connected_i (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     reconnected_i (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     disconnected_i (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 89fa3596658..631c41190c6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -18,16 +18,16 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                             *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->connected_i (this->object_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->connected_i (this->object_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
 
   return 0;
@@ -40,16 +40,16 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->reconnected_i (this->object_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->reconnected_i (this->object_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   return 0;
 }
@@ -61,16 +61,16 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->disconnected_i (this->object_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->disconnected_i (this->object_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     }
   return 0;
 }
@@ -82,14 +82,14 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
-      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
-      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
+      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 2fc47be1f6c..28d63858848 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -31,14 +31,14 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work ((*i) TAO_ENV_ARG_PARAMETER);
+      worker->work ((*i) ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index db5b6b2563a..8d08c77b968 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -33,14 +33,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
index 21bf4981b67..d90394ed395 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
@@ -3,40 +3,40 @@
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 21123fd2cd9..c514674fda3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -29,34 +29,34 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_connected (PEER *peer
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_reconnected (PEER *peer
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_disconnected (PEER *peer
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_PEER_ADMIN_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 256e342e17a..646fab48906 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -38,17 +38,17 @@
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
@@ -67,7 +67,7 @@ public:
    * The default implementation is a no-op.
    */
   virtual void peer_connected (PEER *peer
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -77,7 +77,7 @@ public:
    * <reconnected> method
    */
   virtual void peer_reconnected (PEER *peer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -86,7 +86,7 @@ public:
    * proxy.
    */
   virtual void peer_disconnected (PEER *peer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 81f2ea5d27a..ad0678ae0a7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -13,12 +13,12 @@ ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$")
 
 template<class P, class R> void
 TAO_ESF_Peer_Connected<P,R>::work (P *proxy
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
@@ -26,12 +26,12 @@ TAO_ESF_Peer_Connected<P,R>::work (P *proxy
 
 template<class P, class R> void
 TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
-  proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
@@ -39,12 +39,12 @@ TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
 
 template<class P, class R> void
 TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
-  proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index e69984da721..9998a29d19f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -33,7 +33,7 @@ public:
   TAO_ESF_Peer_Connected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -56,7 +56,7 @@ public:
   TAO_ESF_Peer_Reconnected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -79,7 +79,7 @@ public:
   TAO_ESF_Peer_Disconnected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 062b06869aa..a4bbb416902 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -30,7 +30,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (TAO_ENV_SINGLE_ARG_DECL)
+    obtain (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
@@ -39,10 +39,10 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   PortableServer::ServantBase_var holder = proxy;
 
   ACE_TYPENAME PROXY::_var_type result =
-    proxy->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+    proxy->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
-  this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   return result._retn ();
@@ -50,21 +50,21 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
-  this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     connected (PROXY *
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -72,24 +72,24 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
   ACE_TRY
     {
-      this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
+      this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index a76275f083b..dfe39ce311e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -53,7 +53,7 @@
  * // The T_var for the IDL interface implemented by the PROXY.
  *
  * PROXY::_ptr_type
- * PROXY::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
+ * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
  * // activate the proxy and return the object reference
  * @endverbatim
  *
@@ -70,7 +70,7 @@ public:
 
   /// Iterate over its internal collection.
   void for_each (TAO_ESF_Worker<PROXY> *worker
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
@@ -80,7 +80,7 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -88,7 +88,7 @@ public:
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -97,7 +97,7 @@ public:
    * The default implementation is a no-op.
    */
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -107,7 +107,7 @@ public:
    * <reconnected> method
    */
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -116,7 +116,7 @@ public:
    * proxy.
    */
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
index be00cdad82e..9eec0894754 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
@@ -3,8 +3,8 @@
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
     for_each (TAO_ESF_Worker<P> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index b04cbe9f3b7..0337ec87245 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -129,12 +129,12 @@ public:
    * This encapsulates
    */
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL) = 0;
+                         ACE_ENV_ARG_DECL) = 0;
 
   /// Insert a new element into the collection.  The collection assumes
   /// ownership of the element.
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
 
   /**
    * Insert an element into the collection.  No errors can be raised
@@ -144,14 +144,14 @@ public:
    * collection.
    */
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL) = 0;
+                            ACE_ENV_ARG_DECL) = 0;
 
   /// Remove an element from the collection.
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index e871ce15a7d..04702e9feed 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -19,7 +19,7 @@ TAO_ESF_Proxy_List<PROXY>::
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -40,7 +40,7 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -65,7 +65,7 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.remove (proxy);
   if (r != 0)
@@ -78,7 +78,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index 85d6d3f9914..4a2410b1a70 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -50,19 +50,19 @@ public:
 
   /// Insert a new element to the collection
   void connected (PROXY *
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
   void reconnected (PROXY *
-                    TAO_ENV_ARG_DECL_NOT_USED);
+                    ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Remove an element from the collection
   void disconnected (PROXY *
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 002cc934635..9e6993882d8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -19,7 +19,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.bind (proxy, 1);
   if (r == 0)
@@ -40,7 +40,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.rebind (proxy, 1);
   if (r == 0)
@@ -63,7 +63,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.unbind (proxy);
   if (r != 0)
@@ -76,7 +76,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index c957b46209a..ccaa98f8010 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -74,18 +74,18 @@ public:
 
   /// Insert a new element to the collection
   void connected (PROXY *
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
   void reconnected (PROXY *
-                    TAO_ENV_ARG_DECL_NOT_USED);
+                    ACE_ENV_ARG_DECL_NOT_USED);
   /// Remove an element from the collection
   void disconnected (PROXY *
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 21627fef89f..6058198ef9e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -13,11 +13,11 @@ ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$")
 
 template<class PROXY> void
 TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index 69b3de4dc73..feffd2ccb3a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -27,7 +27,7 @@ public:
   TAO_ESF_Shutdown_Proxy (void);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index c555be82e53..fe282efe565 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -35,7 +35,7 @@ public:
 
   /// Callback interface.
   virtual void work (Object *object
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
 };
 
 #if defined (__ACE_INLINE__)