diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp')
-rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp index 2110f1b4821..bfd0ef01252 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp @@ -19,10 +19,10 @@ ECCL_Consumer::ECCL_Consumer (int iterations) void ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, int event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -31,12 +31,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -53,12 +53,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECCL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -70,17 +70,17 @@ ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; 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); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -92,7 +92,7 @@ ECCL_Consumer::sample_history (void) void ECCL_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -106,7 +106,7 @@ ECCL_Consumer::push (const RtecEventComm::EventSet &events } void -ECCL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECCL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); |