diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp')
-rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp index b314b80feeb..7492cf40eb2 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp @@ -17,14 +17,14 @@ ECFS_Loopback::ECFS_Loopback (void) void ECFS_Loopback::init (CORBA::Long experiment_id, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->supplier_ = Servant_var<ECFS_Loopback_Supplier> ( new ECFS_Loopback_Supplier (experiment_id) ); - this->supplier_->connect (ec, ACE_TRY_ENV); + this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_ = @@ -32,30 +32,30 @@ ECFS_Loopback::init (CORBA::Long experiment_id, new ECFS_Loopback_Consumer (experiment_id, this->supplier_.in ()) ); - this->consumer_->connect (ec, ACE_TRY_ENV); + this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback::destroy (CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->consumer_->disconnect (ACE_TRY_ENV); + this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->supplier_->disconnect (ACE_TRY_ENV); + this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } |