diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 3641ca65f32..96aa030b188 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -16,35 +16,31 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T () { } -template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR +template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void) { return this->get_proxy (); } -template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR -TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL) +template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR +TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr) { Supplier_Traits traits; CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = admin_ptr->obtain_notification_push_consumer (traits.type_ , this->proxy_id_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); - return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in () - ACE_ENV_ARG_PARAMETER); + return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()); } -template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR -TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr - , CosNotification::QoSProperties& qos - ACE_ENV_ARG_DECL) +template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR +TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr + , CosNotification::QoSProperties& qos) { Supplier_Traits traits; @@ -52,18 +48,15 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = admin_ptr->obtain_notification_push_consumer_with_qos (traits.type_ , this->proxy_id_ - , qos - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); + , qos); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); - return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in () - ACE_ENV_ARG_PARAMETER); + return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()); } template <class Supplier_Traits> void -TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL) +TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed) { // Let the user see what we're subscribed for, ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n")); @@ -82,17 +75,15 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::Eve ACE_DEBUG ((LM_DEBUG, "\n")); /// subscribe - ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy (); + typename Proxy_Traits::PTR proxy_consumer = this->get_proxy (); - proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + proxy_consumer->offer_change (added, removed); } template <class Supplier_Traits> void TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change ( const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException, |