diff options
Diffstat (limited to 'TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp index 22c9c9361c3..7f641e692a6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp @@ -17,8 +17,8 @@ Hash_ReplicaControl::Hash_ReplicaControl (void) void Hash_ReplicaControl::init (CORBA::ORB_ptr orb, - LoadBalancing::LoadBalancer_ptr balancer, - CORBA::Environment &ACE_TRY_ENV) + LoadBalancing::LoadBalancer_ptr balancer + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Hash_ReplicaControl::init\n")); @@ -28,21 +28,21 @@ Hash_ReplicaControl::init (CORBA::ORB_ptr orb, reactor->schedule_timer (&this->adapter_, 0, interval, restart); LoadBalancing::ReplicaControl_var control = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var replica = - this->replica_._this (ACE_TRY_ENV); + this->replica_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->group_ = - balancer->group_identity (ACE_TRY_ENV); + balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = balancer->connect (control.in (), - replica.in (), - ACE_TRY_ENV); + replica.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -66,8 +66,8 @@ Hash_ReplicaControl::handle_timeout (const ACE_Time_Value &, ACE_TRY_NEW_ENV { - this->proxy_->current_load (this->current_load_, - ACE_TRY_ENV); + this->proxy_->current_load (this->current_load_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Current_Load = %f\n", this->current_load_)); } @@ -86,7 +86,7 @@ Hash_ReplicaControl::request_received (void) void -Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV) +Hash_ReplicaControl::request_rejected (TAO_ENV_SINGLE_ARG_DECL) { // @@ Ossama: notice how we reject a single request. Maybe the // advisory should include how many are we supposed to shed? @@ -97,8 +97,8 @@ Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV) } void -Hash_ReplicaControl::high_load_advisory (CORBA::Environment & - /* ACE_TRY_ENV */) +Hash_ReplicaControl::high_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED + /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify the replica that it should reject all requests. @@ -107,8 +107,8 @@ Hash_ReplicaControl::high_load_advisory (CORBA::Environment & } void -Hash_ReplicaControl::nominal_load_advisory (CORBA::Environment & - /* ACE_TRY_ENV */) +Hash_ReplicaControl::nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED + /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify the replica that it should once again accept requests. |