diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp index 9d3029e90a6..c5a6f80b12f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp @@ -19,7 +19,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsume } void -TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -61,12 +61,12 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN } void -TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { ACE_TRY { - this->push_supplier_->subscription_change (added, removed, - ACE_TRY_ENV); + this->push_supplier_->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -77,7 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::Ev } void -TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -100,24 +100,24 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi TAO_Notify_StructuredEvent* notify_event = new TAO_Notify_StructuredEvent (notification_copy); - this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); } void -TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); + deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |