diff options
Diffstat (limited to 'TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp')
| -rw-r--r-- | TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp index 4e0a2a56dea..7b81ae125a2 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -33,7 +33,7 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void) } int -IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) +IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -45,13 +45,13 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // Resolve the name CORBA::Object_var factory_object = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow corbaloc::Status_var factory = - corbaloc::Status::_narrow (factory_object.in (), ACE_TRY_ENV); + corbaloc::Status::_narrow (factory_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -64,7 +64,7 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // Invoke a request on the server CORBA::Boolean ret_value = - factory->print_status (ACE_TRY_ENV); + factory->print_status (TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value != 0) @@ -72,7 +72,7 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "The server has not been contacted. Error!!\n", 0)); - } + } } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) { @@ -94,8 +94,8 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) int IOR_corbaloc_Client_i::init (int& argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { ACE_TRY @@ -105,20 +105,20 @@ IOR_corbaloc_Client_i::init (int& argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); if(argc < 2){ - ACE_DEBUG((LM_DEBUG, "\nUsage:\n %s [corbaloc URL for NameService]\n", argv[0])); - ACE_OS::exit(-1); + ACE_DEBUG((LM_DEBUG, "\nUsage:\n %s [corbaloc URL for NameService]\n", argv[0])); + ACE_OS::exit(-1); } corbaloc_url_ = argv[1]; // Get a reference to the Naming Service CORBA::Object_var naming_context_object = - orb->string_to_object (corbaloc_url_.c_str(), - ACE_TRY_ENV); + orb->string_to_object (corbaloc_url_.c_str() + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_context_object.in ())) @@ -128,8 +128,8 @@ IOR_corbaloc_Client_i::init (int& argc, // Narrow to get the correct reference this->naming_context_ = - CosNaming::NamingContextExt::_narrow (naming_context_object.in (), - ACE_TRY_ENV); + CosNaming::NamingContextExt::_narrow (naming_context_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->naming_context_.in ())) |