diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp index 341fabcdaac..a76009be6f6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp @@ -18,10 +18,10 @@ ECFS_Loopback_Supplier::ECFS_Loopback_Supplier (CORBA::Long experiment_id) void ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -48,12 +48,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (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; } void ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -101,11 +101,11 @@ ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source events[i].header.source = this->experiment_id_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECFS_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); |