1 files changed, 7 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 18a1c92a0d2..dba87df34f5 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -30,32 +30,26 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel ACE_ENV_ARG_DECL)
+                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
                                 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(notify_channel);
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
-  this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 static void validate_expression(bool expr, const char* msg)
@@ -70,8 +64,7 @@ static void validate_expression(bool expr, const char* msg)
 
 void
 Notify_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));