1 files changed, 22 insertions, 22 deletions

diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
index d23a91a4905..440a34d0ffc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
@@ -19,27 +19,27 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 }
 
 void TAO_Notify_PushSupplier::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 void
 TAO_Notify_PushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
-  CosNotifyComm::PushSupplier_var objref = 
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosNotifyComm::PushSupplier_var objref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
-                        CosNotifyChannelAdmin::ANY_EVENT, 
-                        this->my_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::ANY_EVENT,
+                        this->my_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
@@ -48,12 +48,12 @@ TAO_Notify_PushSupplier::connect (
   // Narrow.
   this->consumer_proxy_ =
     CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (consumer_proxy_.in ()));
 
   this->consumer_proxy_->connect_any_push_supplier (objref.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Give ownership to POA.
@@ -61,39 +61,39 @@ TAO_Notify_PushSupplier::connect (
 }
 
 void
-TAO_Notify_PushSupplier::send_event (const CORBA::Any & data TAO_ENV_ARG_DECL)
+TAO_Notify_PushSupplier::send_event (const CORBA::Any & data ACE_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_PushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->consumer_proxy_->disconnect_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_PushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_PushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -102,7 +102,7 @@ void
 TAO_Notify_PushSupplier::subscription_change
    (const CosNotification::EventTypeSeq &/*added*/,
     const CosNotification::EventTypeSeq &/*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -110,8 +110,8 @@ TAO_Notify_PushSupplier::subscription_change
 }
 
 void
-TAO_Notify_PushSupplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }