diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp index 55084b3aeb3..3f6e3be9953 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp @@ -14,7 +14,7 @@ TAO_Notify_FilterAdmin_i::~TAO_Notify_FilterAdmin_i (void) } CORBA::Boolean -TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme for (; iter.next (entry); iter.advance ()) { - ret_val = event.do_match (entry->int_id_.in (), ACE_TRY_ENV); + ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == 1) @@ -44,8 +44,8 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme CosNotifyFilter::FilterID TAO_Notify_FilterAdmin_i::add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,7 +69,7 @@ TAO_Notify_FilterAdmin_i::add_filter ( } } -void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id, CORBA::Environment &ACE_TRY_ENV) +void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound @@ -83,8 +83,8 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i CosNotifyFilter::Filter_ptr TAO_Notify_FilterAdmin_i::get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,28 +102,28 @@ TAO_Notify_FilterAdmin_i::get_filter ( } CosNotifyFilter::FilterIDSeq* -TAO_Notify_FilterAdmin_i::get_all_filters (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_ids_.get_sequence(ACE_TRY_ENV); + return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_FilterAdmin_i::remove_all_filters (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CosNotifyFilter::FilterIDSeq* id_list = - this->get_all_filters (ACE_TRY_ENV); + this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < id_list->length (); ++i) { CosNotifyFilter::FilterID id = (*id_list)[i]; - this->remove_filter (id, ACE_TRY_ENV); + this->remove_filter (id TAO_ENV_ARG_PARAMETER); ACE_CHECK; } |