diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index d9095545817..fd447d57433 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -37,17 +37,16 @@ TAO_Notify_Method_Request_Lookup::~TAO_Notify_Method_Request_Lookup () void TAO_Notify_Method_Request_Lookup::work ( - TAO_Notify_ProxySupplier* proxy_supplier - ACE_ENV_ARG_DECL) + TAO_Notify_ProxySupplier* proxy_supplier) { if (delivery_request_.get () == 0) { TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true); - proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER); + proxy_supplier->deliver (request); } else { - delivery_request_->dispatch (proxy_supplier, true ACE_ENV_ARG_PARAMETER); + delivery_request_->dispatch (proxy_supplier, true); } } @@ -60,8 +59,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) CORBA::Boolean val = this->proxy_consumer_->check_filters (this->event_, parent.filter_admin (), - parent.filter_operator () - ACE_ENV_ARG_PARAMETER); + parent.filter_operator ()); if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val)); @@ -73,7 +71,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) // The map of subscriptions. TAO_Notify_Consumer_Map& map = this->proxy_consumer_->event_manager ().consumer_map (); - TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type () ACE_ENV_ARG_PARAMETER); + TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type ()); TAO_Notify_ProxySupplier_Collection* consumers = 0; @@ -83,7 +81,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) if (consumers != 0) { - consumers->for_each (this ACE_ENV_ARG_PARAMETER); + consumers->for_each (this); } map.release (entry); @@ -94,7 +92,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) if (consumers != 0) { - consumers->for_each (this ACE_ENV_ARG_PARAMETER); + consumers->for_each (this); } this->complete (); return 0; @@ -105,8 +103,7 @@ TAO_Notify_Method_Request_Lookup_Queueable * TAO_Notify_Method_Request_Lookup::unmarshal ( TAO_Notify::Delivery_Request_Ptr & delivery_request, TAO_Notify_EventChannelFactory &ecf, - TAO_InputCDR & cdr - ACE_ENV_ARG_DECL) + TAO_InputCDR & cdr) { bool ok = true; TAO_Notify_Method_Request_Lookup_Queueable * result = 0; @@ -131,7 +128,7 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( { TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer ( id_path, - 0 ACE_ENV_ARG_PARAMETER); + 0); if (proxy_consumer != 0) { ACE_NEW_NORETURN (result, |