diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp | 69 |
1 files changed, 27 insertions, 42 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index ac6dce9b64a..02f47b5c48b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -32,90 +32,77 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) } void -TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event) { TAO_CEC_Propagate_Event_Push push_worker (event); - this->push_admin_.for_each (&push_worker - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->push_admin_.for_each (&push_worker); TAO_CEC_Propagate_Event_Pull pull_worker (event); - this->pull_admin_.for_each (&pull_worker - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->pull_admin_.for_each (&pull_worker); } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier) { - this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); + this->push_admin_.connected (supplier); } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier) { - this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); + this->push_admin_.reconnected (supplier); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier) { - this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); + this->push_admin_.disconnected (supplier); } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier) { - this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); + this->pull_admin_.connected (supplier); } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier) { - this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); + this->pull_admin_.reconnected (supplier); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier) { - this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); + this->pull_admin_.disconnected (supplier); } void -TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::shutdown (void) { - this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->push_admin_.shutdown (); - this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->pull_admin_.shutdown (); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ConsumerAdmin::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -123,19 +110,17 @@ TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // **************************************************************** void -TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier) { - supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); + supplier->push (this->event_); } // **************************************************************** void -TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier - ACE_ENV_ARG_DECL) +TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier) { - supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); + supplier->push (this->event_); } TAO_END_VERSIONED_NAMESPACE_DECL |