diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/lib/Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Consumer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index c8fdfc9a2f5..ed9c16e3de3 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -23,20 +23,20 @@ EC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); } void EC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; // @@ Throw? @@ -45,14 +45,14 @@ EC_Consumer::connect ( if (CORBA::is_nil (this->myself_.in ())) { - this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->is_active_ = 1; this->supplier_proxy_->connect_push_consumer (this->myself_.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -63,12 +63,12 @@ EC_Consumer::connected (void) const } void -EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -76,19 +76,19 @@ EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Consumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { if (!this->is_active_) return; // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->myself_ = RtecEventComm::PushConsumer::_nil (); this->is_active_ = 0; @@ -109,10 +109,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const void EC_Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_push (this->cookie_, events TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (events.length () == 0) @@ -149,16 +149,16 @@ EC_Consumer::push (const RtecEventComm::EventSet& events now - creation); if (e.header.type == this->shutdown_event_type_) - this->driver_->consumer_shutdown (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -EC_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); |