diff options
Diffstat (limited to 'TAO/examples/Load_Balancing/Identity_Client.cpp')
| -rw-r--r-- | TAO/examples/Load_Balancing/Identity_Client.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 70f499475d3..4fb31825759 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -73,12 +73,12 @@ Identity_Client::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -100,7 +100,7 @@ Identity_Client::init (int argc, } int -Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n")); @@ -108,11 +108,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -131,11 +131,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) "with id <%s>\n", group_name)); Load_Balancer::Object_Group_var object_group = factory->resolve (group_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // List <Object_Group>'s id. - CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ACE_OS::strcmp (id.in (), group_name) != 0) @@ -150,7 +150,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) group_name)); Load_Balancer::Member_ID_List_var id_list = - object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER); + object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -177,11 +177,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) for (size_t ind = 0; ind < this->number_of_invocations_; ++ind) { - obj = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); identity_object = Identity::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (identity_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -189,7 +189,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) "<Object_Group::resolve> to <Identity>\n"), -1); identity_object->get_name (identity.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -212,10 +212,10 @@ main (int argc, char *argv[]) if (client.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |