diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 07ba1cbfdd9..640f8cfd8c6 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -21,7 +21,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter () } char* -TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -32,7 +32,6 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +78,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra ACE_NEW_THROW_EX (infoseq_ptr, CosNotifyFilter::ConstraintInfoSeq (0), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return infoseq_ptr; } @@ -87,7 +85,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra void TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/, const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/ - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -100,7 +97,6 @@ TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::Cons CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/ - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::ConstraintNotFound)) @@ -109,26 +105,25 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void -TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_Test_Filter::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK; PortableServer::POA_var my_POA = _default_POA (); @@ -139,7 +134,7 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */ - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) { @@ -149,14 +144,12 @@ TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */ CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this)); @@ -168,14 +161,10 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct CORBA::ORB_ptr orb = poa->orb_core ().orb (); CORBA::Object_var object = - orb->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + orb->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + RTCORBA::Current::_narrow (object.in ()); // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -252,7 +241,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match_typed ( const CosNotification::PropertySeq & /* filterable_data */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) @@ -264,7 +252,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_typed ( CosNotifyFilter::CallbackID TAO_Notify_Tests_RT_Test_Filter::attach_callback ( CosNotifyComm::NotifySubscribe_ptr /* callback */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -275,16 +262,15 @@ TAO_Notify_Tests_RT_Test_Filter::attach_callback ( void TAO_Notify_Tests_RT_Test_Filter::detach_callback ( CosNotifyFilter::CallbackID /* callback */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::CallbackNotFound)) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_Tests_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), |