diff options
Diffstat (limited to 'TAO/orbsvcs/Time_Service/Clerk_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/Time_Service/Clerk_i.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index 34dece01cc1..7e2936e8f0d 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -53,7 +53,7 @@ Clerk_i::read_ior (const char *filename) int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { for (char *str = ACE_OS::strtok (data, "\n"); @@ -65,8 +65,8 @@ Clerk_i::read_ior (const char *filename) str)); CORBA::Object_var objref = - this->orb_->string_to_object (str, - ACE_TRY_ENV); + this->orb_->string_to_object (str + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Return if the server reference is nil. @@ -79,8 +79,8 @@ Clerk_i::read_ior (const char *filename) } CosTime::TimeService_ptr server = - CosTime::TimeService::_narrow (objref.in (), - ACE_TRY_ENV); + CosTime::TimeService::_narrow (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->insert_server (server); @@ -170,7 +170,7 @@ Clerk_i::parse_args (void) int Clerk_i::get_first_IOR (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char host_name[MAXHOSTNAMELEN]; @@ -187,14 +187,14 @@ Clerk_i::get_first_IOR (void) // Resolve name. CORBA::Object_var temp_object = - this->my_name_server_->resolve (server_context_name, - ACE_TRY_ENV); + this->my_name_server_->resolve (server_context_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var server_context = - CosNaming::NamingContext::_narrow (temp_object.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (temp_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_context.in ())) @@ -212,13 +212,13 @@ Clerk_i::get_first_IOR (void) server_name[0].id = bindings_list[0u].binding_name[0].id; temp_object = - server_context->resolve (server_name, - ACE_TRY_ENV); + server_context->resolve (server_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTime::TimeService_var obj = - CosTime::TimeService::_narrow (temp_object.in (), - ACE_TRY_ENV); + CosTime::TimeService::_narrow (temp_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -257,15 +257,15 @@ int Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, CosNaming::NamingContext_var server_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosNaming::Binding_var binding; if (!CORBA::is_nil (iter.in ())) { - while (iter->next_one (binding.out (), - ACE_TRY_ENV)) + while (iter->next_one (binding.out () + TAO_ENV_ARG_PARAMETER)) { ACE_TRY_CHECK; @@ -278,13 +278,13 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, server_name[0].id = binding->binding_name[0].id; CORBA::Object_var temp_object = - server_context->resolve (server_name, - ACE_TRY_ENV); + server_context->resolve (server_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTime::TimeService_ptr server = - CosTime::TimeService::_narrow (temp_object.in (), - ACE_TRY_ENV); + CosTime::TimeService::_narrow (temp_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->insert_server (server); @@ -311,15 +311,15 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, int Clerk_i::init_naming_service (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the POA. this->orb_manager_.init_child_poa (this->argc_, this->argv_, - "my_child_poa", - ACE_TRY_ENV); + "my_child_poa" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_ptr child_poa @@ -350,7 +350,7 @@ Clerk_i::init_naming_service (void) int Clerk_i::create_clerk (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -368,8 +368,8 @@ Clerk_i::create_clerk (void) // Convert the clerk reference to a string. CORBA::String_var objref_clerk = - this->orb_->object_to_string (this->time_service_clerk_.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (this->time_service_clerk_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the clerk IOR on the console. @@ -405,11 +405,11 @@ Clerk_i::create_clerk (void) int Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->my_name_server_->resolve - (clerk_context_name, ACE_TRY_ENV); + (clerk_context_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, userex) @@ -427,7 +427,7 @@ Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name) int Clerk_i::register_clerk (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Bind the Clerk in its appropriate Context. @@ -440,12 +440,12 @@ Clerk_i::register_clerk (void) if (if_first_clerk (clerk_context_name)) { - clerk_context = this->my_name_server_->new_context (ACE_TRY_ENV); + clerk_context = this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->my_name_server_->rebind_context (clerk_context_name, - clerk_context.in (), - ACE_TRY_ENV); + clerk_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -466,8 +466,8 @@ Clerk_i::register_clerk (void) clerk_name[1].id = CORBA::string_dup (clerk_mc_name); this->my_name_server_->rebind (clerk_name, - this->time_service_clerk_.in (), - ACE_TRY_ENV); + this->time_service_clerk_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -485,8 +485,8 @@ Clerk_i::register_clerk (void) int Clerk_i::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -502,15 +502,15 @@ Clerk_i::init (int argc, this->orb_manager_.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->orb_manager_.init_child_poa (argc, argv, - "child_poa", - ACE_TRY_ENV) == -1) + "child_poa" + TAO_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -570,12 +570,12 @@ Clerk_i::init (int argc, } int -Clerk_i::run (CORBA::Environment &ACE_TRY_ENV) +Clerk_i::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Run the main event loop for the ORB. - int r = this->orb_manager_.run (ACE_TRY_ENV); + int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) |