diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 07472f4c717..49022892370 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; ACE_TRY { - result = this->_this (ACE_TRY_ENV); + result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -81,8 +81,8 @@ TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) CORBA::Any* TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( - CORBA::Boolean_out has_event, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) { has_event = 0; CosEventComm::PullSupplier_var supplier; @@ -106,7 +106,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->try_pull (has_event, ACE_TRY_ENV); + any = supplier->try_pull (has_event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) @@ -114,7 +114,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( TAO_CEC_SupplierControl *control = this->event_channel_->supplier_control (); - control->supplier_not_exist (this, ACE_TRY_ENV); + control->supplier_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -123,8 +123,8 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( this->event_channel_->supplier_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -137,7 +137,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any* TAO_CEC_ProxyPullConsumer::pull_from_supplier ( - CORBA::Environment& ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; { @@ -160,7 +160,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->pull (ACE_TRY_ENV); + any = supplier->pull (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -174,8 +174,8 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Boolean TAO_CEC_ProxyPullConsumer::supplier_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -191,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->supplier_->_non_existent (ACE_TRY_ENV); + return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; @@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) supplier = this->supplier_._retn (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - supplier->disconnect_pull_supplier (ACE_TRY_ENV); + supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -262,8 +262,8 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( - CosEventComm::PullSupplier_ptr pull_supplier, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PullSupplier_ptr pull_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -298,7 +298,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullSupplier_var supplier; @@ -337,14 +337,14 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - supplier->disconnect_pull_supplier (ACE_TRY_ENV); + supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -357,19 +357,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPullConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } |