diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp index 59d648ee2c9..5546115643c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp @@ -18,40 +18,40 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer () CosNotifyChannelAdmin::ProxyPushSupplier::_nil (); } -void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/) +void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } PortableServer::POA_ptr -TAO_Notify_PushConsumer::_default_POA (CORBA::Environment &/*env*/) +TAO_Notify_PushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ - CosNotifyComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + CosNotifyComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->supplier_proxy_ = - CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_proxy_.in ())); - this->supplier_proxy_->connect_any_push_consumer (objref.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_any_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -59,32 +59,35 @@ TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consu } void -TAO_Notify_PushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_PushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_PushConsumer::offer_change + (const CosNotification::EventTypeSeq &/*added*/, + const CosNotification::EventTypeSeq &/*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -94,7 +97,9 @@ TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*ad } void -TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_PushConsumer::push + (const CORBA::Any & /*data*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -104,10 +109,10 @@ TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment & } void -TAO_Notify_PushConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } |