Merged corba-env-clean branch.

1 files changed, 26 insertions, 22 deletions

diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
index 98a33f33ebc..59ae4ad8fe5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
@@ -18,33 +18,34 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
     CosNotifyChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
-void TAO_Notify_PushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+void TAO_Notify_PushSupplier::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 void
-TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  CosNotifyComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->consumer_proxy_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in (),
-                                                       ACE_TRY_ENV);
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (consumer_proxy_.in ()));
 
-  this->consumer_proxy_->connect_any_push_supplier (objref.in (),
-                                                    ACE_TRY_ENV);
+  this->consumer_proxy_->connect_any_push_supplier (objref.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -52,43 +53,46 @@ TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr suppl
 }
 
 void
-TAO_Notify_PushSupplier::send_event (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::send_event (const CORBA::Any & data TAO_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
+  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_PushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_PushSupplier::_default_POA (CORBA::Environment& /* env */)
+TAO_Notify_PushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_PushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq &/*added*/,
+    const CosNotification::EventTypeSeq &/*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
                        CORBA::SystemException,
                        CosNotifyComm::InvalidEventType
@@ -98,10 +102,10 @@ TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSe
 }
 
 void
-TAO_Notify_PushSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }