diff options
Diffstat (limited to 'TAO/orbsvcs/LoadBalancer')
-rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp | 30 | ||||
-rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadBalancer.h | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp | 6 |
3 files changed, 23 insertions, 23 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp index b37a5b97f82..ba9776ace2e 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp @@ -23,8 +23,8 @@ TAO_LoadBalancer::~TAO_LoadBalancer (void) void TAO_LoadBalancer::parse_args (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { ACE_Get_Opt get_opts (argc, argv, "i:o:s:h"); @@ -64,32 +64,32 @@ TAO_LoadBalancer::parse_args (int argc, void TAO_LoadBalancer::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA from the ORB. CORBA::Object_var poa = - this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA object. - this->root_poa_ = PortableServer::POA::_narrow (poa.in (), - ACE_TRY_ENV); + this->root_poa_ = PortableServer::POA::_narrow (poa.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_TRY_ENV); + this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Check the non-ORB arguments. - this->parse_args (argc, argv, ACE_TRY_ENV); + this->parse_args (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Initialize the LoadBalancer servant. @@ -104,11 +104,11 @@ TAO_LoadBalancer::init (int argc, this->root_poa_.in ())); CORBA::Object_var obj = - this->balancer_->_this (ACE_TRY_ENV); + this->balancer_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (obj.in (), ACE_TRY_ENV); + this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; FILE *lb_ior = ACE_OS::fopen (this->load_balancer_file_, "w"); @@ -129,7 +129,7 @@ TAO_LoadBalancer::usage (const char *cmd) const } void -TAO_LoadBalancer::run (CORBA::Environment &ACE_TRY_ENV) +TAO_LoadBalancer::run (TAO_ENV_SINGLE_ARG_DECL) { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h index 4e8d2f32a1d..4c0b97a425c 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h @@ -38,16 +38,16 @@ public: ~TAO_LoadBalancer (void); // Destructor. - void init (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv[] + TAO_ENV_ARG_DECL); // Initialize the service - void run (CORBA_Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run the TAO_Loadbalancer. protected: - void parse_args (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV); + void parse_args (int argc, char *argv[] + TAO_ENV_ARG_DECL); // parses the arguments. void usage (const char *msg) const; diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp index d71019e12c9..bc77f0cb4e0 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp @@ -10,15 +10,15 @@ int main (int argc, char *argv[]) { // @@ Ossama: i'm not sure what the LoadBalancer class buys you. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { TAO_LoadBalancer balancer; - balancer.init (argc, argv, ACE_TRY_ENV); + balancer.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - balancer.run (ACE_TRY_ENV); + balancer.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |