summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2000-04-21 21:58:46 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2000-04-21 21:58:46 +0000
commit6d1a656c26ec331fa60726bc48021c3874251f3c (patch)
tree643b3ca6aa3198f6f4c8d162123fa771d3106855
parent6f5755afa910fdf06f91940699e537e3c0a9584c (diff)
downloadATCD-loadbalancing.tar.gz
ChangeLogTag:Fri Apr 21 14:54:30 2000 Ossama Othman <ossama@uci.edu>loadbalancing
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp8
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadBalancer.h7
2 files changed, 8 insertions, 7 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
index 2c6913b1f90..0269feb43bd 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
@@ -92,15 +92,15 @@ TAO_LoadBalancer::init (int argc,
ACE_CHECK;
// Initialize the LoadBalancer servant.
- Load_Balancing_Strategy *strategy =
+ TAO_LB_LoadBalancing_Strategy *strategy =
&this->round_robin_;
if (this->strategy_ == 1)
strategy = &this->minimum_dispersion_;
ACE_NEW (this->balancer_,
- LoadBalancer_Impl (this->interface_repository_id_,
- strategy,
- this->root_poa_.in ()));
+ TAO_LB_LoadBalancer (this->interface_repository_id_,
+ strategy,
+ this->root_poa_.in ()));
CORBA::Object_var obj =
this->balancer_->_this (ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
index d8e21ac1570..96aa9318646 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
// $Id$
// ============================================================================
@@ -71,10 +72,10 @@ private:
// generic load balancing service that can implement static,
// per-request and dynamic load balancing? If not, can we share the
// current strategies among them?
- Round_Robin_Strategy round_robin_;
- Minimum_Dispersion_Strategy minimum_dispersion_;
+ TAO_LB_Round_Robin_Strategy round_robin_;
+ TAO_LB_Minimum_Dispersion_Strategy minimum_dispersion_;
- LoadBalancer_Impl *balancer_;
+ TAO_LB_LoadBalancer *balancer_;
// The load balancer
CORBA::ORB_var orb_;