diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 91fe077246f..7efa43f67b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -58,13 +58,13 @@ TAO_EC_And_Filter::size (void) const int TAO_EC_And_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 (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -82,13 +82,13 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_And_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 0; @@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -106,15 +106,15 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_And_Filter::push (const RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, - TAO_EC_QOS_Info& , - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -164,8 +164,8 @@ TAO_EC_And_Filter::can_match ( int TAO_EC_And_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; } |