diff options
Diffstat (limited to 'TAO/orbsvcs/Time_Service/Server_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/Time_Service/Server_i.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index 5716e4c51fb..b236ddced1a 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -63,15 +63,15 @@ Server_i::parse_args (void) // with it. int -Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV) +Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Initialize the POA. this->orb_manager_.init_child_poa (this->argc_, this->argv_, - "child_poa", - ACE_TRY_ENV); + "child_poa" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_ptr child_poa @@ -105,7 +105,7 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV) int Server_i::create_server (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -117,19 +117,19 @@ Server_i::create_server (void) // Register a servant with the child poa. CORBA::String_var server_str = this->orb_manager_.activate_under_child_poa ("server", - this->time_service_server_impl_, - ACE_TRY_ENV); + this->time_service_server_impl_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("server"); CORBA::Object_var server_ref = - this->orb_manager_.child_poa ()->id_to_reference (id.in (), - ACE_TRY_ENV); + this->orb_manager_.child_poa ()->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); - this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in (), - ACE_TRY_ENV); + this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -140,8 +140,8 @@ Server_i::create_server (void) //Convert the server reference to a string. CORBA::String_var objref_server = - this->orb_->object_to_string (server_ref.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (server_ref.in () + TAO_ENV_ARG_PARAMETER); // Print the server IOR on the console. ACE_DEBUG ((LM_DEBUG, @@ -178,11 +178,11 @@ Server_i::create_server (void) int Server_i::if_first_server (CosNaming::Name &server_context_name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->my_name_server_->resolve - (server_context_name, ACE_TRY_ENV); + (server_context_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, userex) @@ -200,7 +200,7 @@ Server_i::if_first_server (CosNaming::Name &server_context_name) int Server_i::register_server (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosNaming::Name server_context_name; @@ -216,13 +216,13 @@ Server_i::register_server (void) { // Get context. server_context = - this->my_name_server_->new_context (ACE_TRY_ENV); + this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind. this->my_name_server_->rebind_context (server_context_name, - server_context.in (), - ACE_TRY_ENV); + server_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -241,8 +241,8 @@ Server_i::register_server (void) // to the Naming Server. this->my_name_server_->rebind (server_name, - this->time_service_server_.in (), - ACE_TRY_ENV); + this->time_service_server_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -266,8 +266,8 @@ Server_i::register_server (void) int Server_i::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -280,8 +280,8 @@ Server_i::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, - "time_server", - ACE_TRY_ENV) == -1) + "time_server" + TAO_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -289,7 +289,7 @@ Server_i::init (int argc, ACE_TRY_CHECK; // Activate the POA Manager. - this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); + this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int result = this->parse_args (); @@ -301,7 +301,7 @@ Server_i::init (int argc, this->orb_ = this->orb_manager_.orb (); // Use the Naming Service Register the above implementation with the Naming Service. - this->init_naming_service (ACE_TRY_ENV); + this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -326,9 +326,9 @@ Server_i::init (int argc, // Run the event loop for ORB. int -Server_i::run (CORBA::Environment &ACE_TRY_ENV) +Server_i::run (TAO_ENV_SINGLE_ARG_DECL) { - int retval = this->orb_manager_.run (ACE_TRY_ENV); + int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == -1) |