diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 28b08859ecb..f4f99440f0c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -13,15 +13,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header int TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info - ACE_ENV_ARG_DECL) + TAO_EC_QOS_Info& qos_info) { if (event.length () != 1) - return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info); if (this->can_match (event[0].header)) { - this->push (event, qos_info ACE_ENV_ARG_PARAMETER); + this->push (event, qos_info); return 1; } return 0; @@ -29,15 +28,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info - ACE_ENV_ARG_DECL) + TAO_EC_QOS_Info& qos_info) { if (event.length () != 1) - return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info); if (this->can_match (event[0].header)) { - this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info); return 1; } return 0; @@ -45,20 +43,18 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info - ACE_ENV_ARG_DECL) + TAO_EC_QOS_Info& qos_info) { if (this->parent () != 0) - this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info); } void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info - ACE_ENV_ARG_DECL) + TAO_EC_QOS_Info& qos_info) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info); } void @@ -111,16 +107,14 @@ TAO_EC_Type_Filter::can_match ( int TAO_EC_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info & - ACE_ENV_ARG_DECL_NOT_USED) + const TAO_EC_QOS_Info &) { return this->can_match (header); } int TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info - ACE_ENV_ARG_DECL) + TAO_EC_QOS_Info& qos_info) { CORBA::ULong maximum = event.length (); if (event.maximum () == 0) @@ -139,7 +133,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, if (matched.length () == 0) return 0; - this->push (matched, qos_info ACE_ENV_ARG_PARAMETER); + this->push (matched, qos_info); return 1; } |