Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 38 insertions, 54 deletions

diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index ea15a0e703e..fc6a0584a54 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -55,7 +55,6 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
           worker->work (*j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           (*j)->_decr_refcnt ();
         }
       delete[] proxies;
@@ -108,11 +107,11 @@ 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>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index d5c7c22fcd8..5a761792bcd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -51,7 +51,7 @@ public:
                             ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
                              ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
 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 cd6173e3181..e0fdc79c247 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -78,7 +78,6 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
       worker->work (*i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 }
 
@@ -128,7 +127,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>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -137,7 +136,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ace_mon.copy->collection.shutdown ();
 }
 
 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 d4a6d9af9c1..e162b5f7c78 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -140,7 +140,7 @@ public:
                             ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
                              ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
 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 67c61362f21..a1bcf09b8df 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -56,7 +56,6 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
       worker->work (*i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
   }
 }
@@ -114,14 +113,12 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   proxy->_incr_refcnt ();
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
       this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
   else
     {
@@ -141,14 +138,12 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   proxy->_incr_refcnt ();
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
       this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
   else
     {
@@ -168,13 +163,11 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
       this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
   else
     {
@@ -189,17 +182,15 @@ 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 (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->busy_count_ == 0)
     {
       // We can shutdown the object immediately
-      this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->shutdown_i ();
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 350f756867e..ae0b28f92c3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -101,7 +101,7 @@ public:
                     ACE_ENV_ARG_DECL);
   void disconnected_i (PROXY *proxy
                      ACE_ENV_ARG_DECL);
-  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown_i (void);
 
   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;
@@ -117,7 +117,7 @@ public:
                             ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
                              ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 4a2192e5a18..bf723bce96e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -30,9 +30,9 @@ 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_i (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown_i (void)
 {
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index e47522719c4..1ef85a18da8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -82,12 +82,12 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i ();
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i ();
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index ff3e7daa3c4..5fbe626a794 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -40,7 +40,6 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
       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 574f6f559db..c8eb2a844fd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -42,7 +42,7 @@ public:
                             ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
                              ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index ac26e4d5800..849b2827a91 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -38,11 +38,11 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 7016971b2f3..b57ad33fed6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -16,10 +16,10 @@ TAO_ESF_Peer_Connected<P,R>::work (P *proxy
                                    ACE_ENV_ARG_DECL)
 {
   proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 
   this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
@@ -29,10 +29,10 @@ TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
                                      ACE_ENV_ARG_DECL)
 {
   proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 
   this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
@@ -42,10 +42,10 @@ TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
                                       ACE_ENV_ARG_DECL)
 {
   proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 
   this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 68407b8a0ea..5ea8f3bc1b6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -28,7 +28,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 (ACE_ENV_SINGLE_ARG_DECL)
+    obtain (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
@@ -38,27 +38,25 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
   ACE_TYPENAME PROXY::_ptr_type r;
   proxy->activate (r ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   ACE_TYPENAME PROXY::_var_type result = r;
 
   this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   return result._retn ();
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
   this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Cannot happen, just following the discipline.
+// Cannot happen, just following the discipline.
 
-  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown ();
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
@@ -84,13 +82,12 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK; // Cannot happen, just following the discipline.
+  proxy->deactivate ();
+// Cannot happen, just following the discipline.
 
   ACE_TRY
     {
       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 e42104dae90..0833c214e0f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -56,7 +56,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * // The T_var for the IDL interface implemented by the PROXY.
  *
  * PROXY::_ptr_type
- * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
+ * PROXY::activate (void) throw ();
  * // activate the proxy and return the object reference
  * @endverbatim
  *
@@ -83,7 +83,7 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -91,7 +91,7 @@ public:
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index ceaeda03db0..61beba4d15b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -155,7 +155,7 @@ public:
                              ACE_ENV_ARG_DECL) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (void) = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 3b9a49c729c..fe6d5c67822 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -77,7 +77,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::shutdown (void)
 {
   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 a50358146d3..e3e03ba24e4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -64,7 +64,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (void);
 
 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 f3bcdaa5a6b..bd765ad36bd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -75,7 +75,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (void)
 {
   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 34a4fe9522e..92eba90b814 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -90,7 +90,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (void);
 
 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 e7347443f4c..884bddb37ca 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -18,8 +18,7 @@ TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
 {
   ACE_TRY
     {
-      proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->shutdown ();
     }
   ACE_CATCHANY
     {