diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp index d84d4f70955..c2ee361cc98 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp @@ -19,14 +19,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer (void) } void TAO_Notify_SequencePushConsumer::init - (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) + (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } PortableServer::POA_ptr TAO_Notify_SequencePushConsumer::_default_POA ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED + ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); @@ -41,73 +41,73 @@ TAO_Notify_SequencePushConsumer::get_proxy_supplier (void) void TAO_Notify_SequencePushConsumer::connect ( - CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL + CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + ACE_ENV_ARG_DECL ) { // Activate the consumer with the default_POA_. CosNotifyComm::SequencePushConsumer_var consumer_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( - CosNotifyChannelAdmin::SEQUENCE_EVENT, - proxy_supplier_id_ - TAO_ENV_ARG_PARAMETER + CosNotifyChannelAdmin::SEQUENCE_EVENT, + proxy_supplier_id_ + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // Narrow. - this->proxy_supplier_ = + this->proxy_supplier_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( - proxysupplier.in () - TAO_ENV_ARG_PARAMETER + proxysupplier.in () + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Give ownership to POA. this->_remove_ref (); } void -TAO_Notify_SequencePushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequencePushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_SequencePushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequencePushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_->disconnect_sequence_push_supplier ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); ACE_CHECK; - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Notify_SequencePushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { @@ -116,17 +116,17 @@ TAO_Notify_SequencePushConsumer::offer_change void TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException)) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Notify_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch &/*notifications*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { |