diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 2c47a4225ef..ee6d772f2bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -40,55 +40,55 @@ TAO_Notify_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notifica } CORBA::Boolean -TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::do_match ()\n")); - return filter->match(*this->event_ ACE_ENV_ARG_PARAMETER); + return filter->match(*this->event_); } void -TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::push \n")); - consumer->push (*this->event_ ACE_ENV_ARG_PARAMETER); + consumer->push (*this->event_); } void -TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const { CosNotification::StructuredEvent notification; TAO_Notify_Event::translate (*this->event_, notification); - forwarder->forward_structured (notification ACE_ENV_ARG_PARAMETER); + forwarder->forward_structured (notification); } void -TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const { CosNotification::StructuredEvent notification; TAO_Notify_Event::translate (*this->event_, notification); - forwarder->forward_structured_no_filtering (notification ACE_ENV_ARG_PARAMETER); + forwarder->forward_structured_no_filtering (notification); } void -TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const { - forwarder->forward_any (*this->event_ ACE_ENV_ARG_PARAMETER); + forwarder->forward_any (*this->event_); } void -TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const { - forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER); + forwarder->forward_any_no_filtering (*this->event_); } void @@ -113,13 +113,12 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Notify_AnyEvent_No_Copy::copy (void) const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, TAO_Notify_AnyEvent (*this->event_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return new_event; } |