diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index d0d710ed04c..e6b129f6bb3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_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_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::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 @@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -91,7 +91,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) consumer = this->consumer_._retn (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -113,8 +113,8 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard; void -TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -133,16 +133,16 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event, ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push (this, - event, - ACE_TRY_ENV); + event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } void -TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -161,8 +161,8 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event, ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push_nocopy (this, - event, - ACE_TRY_ENV); + event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -199,8 +199,8 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this, ACE_TRY_ENV); + this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } return; @@ -247,12 +247,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushConsumer_var consumer; @@ -273,14 +273,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( } // 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 { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -295,8 +295,8 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( } void -TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event + TAO_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -315,7 +315,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -323,7 +323,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -332,8 +332,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -345,8 +345,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, void TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( - const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) + const CORBA::Any& event + TAO_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -368,7 +368,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -377,8 +377,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -390,8 +390,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_CEC_ProxyPushSupplier::consumer_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_, @@ -407,26 +407,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (ACE_TRY_ENV); + return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } |