summaryrefslogtreecommitdiff
path: root/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp')
-rwxr-xr-xTAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 9fc27d3795b..cf85e5681a4 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -69,8 +69,8 @@ Load_Balancing_Service::init (int argc,
ACE_TRY
{
result = this->orb_manager_.init (argc,
- argv,
- ACE_TRY_ENV);
+ argv
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (result == -1)
return result;
@@ -86,20 +86,20 @@ Load_Balancing_Service::init (int argc,
// Lifespan policy
policies[0] =
- this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT,
- ACE_TRY_ENV);
+ this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
policies[1] =
- this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
- ACE_TRY_ENV);
+ this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var persistent_POA =
this->orb_manager_.root_poa()->create_POA ("persistent",
this->orb_manager_.poa_manager (),
- policies,
- ACE_TRY_ENV);
+ policies
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -108,7 +108,7 @@ Load_Balancing_Service::init (int argc,
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_TRY_ENV);
+ policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -121,13 +121,13 @@ Load_Balancing_Service::init (int argc,
// Activate the POA manager
//PortableServer::ServantBase_var s = factory_servant;
- this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+ this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var objref = factory_servant->_this ();
- ior = this->orb_manager_.orb ()->object_to_string (objref.in (),
- ACE_TRY_ENV);
+ ior = this->orb_manager_.orb ()->object_to_string (objref.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (ior.in () == 0)
@@ -158,11 +158,11 @@ Load_Balancing_Service::init (int argc,
int
-Load_Balancing_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL)
{
int result;
- result = this->orb_manager_.run (ACE_TRY_ENV);
+ result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
return result;
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- result = factory.run (ACE_TRY_ENV);
+ result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY