diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index c4e7e348065..bc5b04a77c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -82,15 +82,15 @@ TAO_EC_Conjunction_Filter::size (void) const int TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (this->current_child_ = this->begin (); this->current_child_ != end; ++this->current_child_) { - int n = (*this->current_child_)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -100,15 +100,15 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -118,8 +118,8 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { CORBA::Long pos = this->current_child_ - this->begin (); int w = pos / bits_per_word; @@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, this->event_[l + i] = event[i]; } if (this->all_received () && this->parent () != 0) - this->parent ()->push_nocopy (this->event_, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - this->push (event, qos_info, ACE_TRY_ENV); + this->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -202,8 +202,8 @@ TAO_EC_Conjunction_Filter::can_match ( int TAO_EC_Conjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info&, - CORBA::Environment &) + const TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } |