diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp | 79 |
1 files changed, 35 insertions, 44 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 3d5bca9accf..495aa338b2a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -55,14 +55,14 @@ TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin () } void -TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec) { - TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER); + TAO_Notify_Admin::init (ec); const CosNotification::QoSProperties &default_ca_qos = TAO_Notify_PROPERTIES::instance ()->default_consumer_admin_qos_properties (); - this->set_qos (default_ca_qos ACE_ENV_ARG_PARAMETER); + this->set_qos (default_ca_qos); } void @@ -94,13 +94,13 @@ TAO_Notify_ConsumerAdmin::destroy (void) if ( result == 1) return; - this->ec_->remove (this ACE_ENV_ARG_PARAMETER); + this->ec_->remove (this); } TAO_Notify::Topology_Object* TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, - CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL) + CORBA::Long id, const TAO_Notify::NVPList& attrs) { TAO_Notify::Topology_Object* result = this; if (type == "proxy_push_supplier") @@ -109,7 +109,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); - result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER); + result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs); } else if (type == "structured_proxy_push_supplier") { @@ -117,7 +117,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); - result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER); + result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs); } else if (type == "sequence_proxy_push_supplier") { @@ -125,7 +125,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); - result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER); + result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs); } #if 0 else if (type == "ec_proxy_push_supplier") @@ -134,12 +134,12 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); - result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER); + result = this->load_proxy(id, attrs); } #endif else { - result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER); + result = TAO_Notify_Admin::load_child (type, id, attrs); } return result; } @@ -148,14 +148,13 @@ TAO_Notify::Topology_Object* TAO_Notify_ConsumerAdmin::load_proxy ( CORBA::Long id, CosNotifyChannelAdmin::ClientType ctype, - const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL) + const TAO_Notify::NVPList& attrs) { TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder(); TAO_Notify_ProxySupplier * proxy = bld->build_proxy (this , ctype - , id - ACE_ENV_ARG_PARAMETER); + , id); ACE_ASSERT(proxy != 0); proxy->load_attrs (attrs); return proxy; @@ -164,7 +163,6 @@ TAO_Notify_ConsumerAdmin::load_proxy ( CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -177,8 +175,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this , ctype , proxy_id - , initial_qos - ACE_ENV_ARG_PARAMETER); + , initial_qos); this->self_change (); return proxy._retn (); } @@ -187,7 +184,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, const CosNotification::QoSProperties & initial_qos - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -199,8 +195,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this , ctype , proxy_id - , initial_qos - ACE_ENV_ARG_PARAMETER); + , initial_qos); this->self_change (); return proxy._retn (); } @@ -212,7 +207,7 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) )) { CosEventChannelAdmin::ProxyPushSupplier_var proxy = - TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER); + TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); this->self_change (); return proxy._retn (); } @@ -252,11 +247,11 @@ TAO_Notify_ConsumerAdmin::push_suppliers (void) { TAO_Notify_Proxy_Seq_Worker seq_worker; - return seq_worker.create (this->proxy_container() ACE_ENV_ARG_PARAMETER); + return seq_worker.create (this->proxy_container()); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyChannelAdmin::ProxyNotFound @@ -264,16 +259,16 @@ TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID pro { TAO_Notify_ProxySupplier_Find_Worker find_worker; - return find_worker.resolve (proxy_id, this->proxy_container() ACE_ENV_ARG_PARAMETER); + return find_worker.resolve (proxy_id, this->proxy_container()); } -void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) +void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos) ACE_THROW_SPEC (( CORBA::SystemException , CosNotification::UnsupportedQoS )) { - this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER); + this->TAO_Notify_Object::set_qos (qos); } @@ -289,7 +284,6 @@ TAO_Notify_ConsumerAdmin::get_qos (void) void TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -307,41 +301,41 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS TAO_Notify_Subscription_Change_Worker worker (added, removed); - this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER); + this->proxy_container().collection()->for_each (&worker); } this->self_change (); } CosNotifyFilter::FilterID -TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) ACE_THROW_SPEC (( CORBA::SystemException )) { CosNotifyFilter::FilterID fid = - this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); + this->filter_admin_.add_filter (new_filter); this->self_change (); return fid; } void -TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter); } ::CosNotifyFilter::Filter_ptr -TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter); } ::CosNotifyFilter::FilterIDSeq* @@ -374,13 +368,13 @@ TAO_Notify_ConsumerAdmin::priority_filter (void) } void -TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } CosNotifyFilter::MappingFilter_ptr @@ -394,12 +388,12 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (void) } void -TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/) ACE_THROW_SPEC (( CORBA::SystemException )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } ::CosNotifyChannelAdmin::ProxyIDSeq* @@ -413,8 +407,7 @@ TAO_Notify_ConsumerAdmin::pull_suppliers (void) CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, - CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ - ACE_ENV_ARG_DECL) + CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyChannelAdmin::AdminLimitExceeded @@ -427,14 +420,13 @@ TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdm void TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException , CosNotification::UnsupportedQoS )) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr @@ -449,15 +441,14 @@ TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void) TAO_Notify_ProxySupplier * TAO_Notify_ConsumerAdmin::find_proxy_supplier ( TAO_Notify::IdVec & id_path, - size_t position - ACE_ENV_ARG_DECL) + size_t position) { TAO_Notify_ProxySupplier * result = 0; size_t path_size = id_path.size (); if (position < path_size) { TAO_Notify_ProxySupplier_Find_Worker find_worker; - TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER); + TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container()); result = dynamic_cast <TAO_Notify_ProxySupplier *> (proxy); } return result; |