diff options
Diffstat (limited to 'TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 93114b7f64f..736b88156d0 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -35,12 +35,12 @@ Concurrency_Service::Concurrency_Service (void) // Constructor taking command-line arguments. Concurrency_Service::Concurrency_Service (int argc, - char** argv, - CORBA::Environment& ACE_TRY_ENV) + char** argv + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::Concurrency_Service (...)\n")); - this->init (argc, argv, ACE_TRY_ENV); + this->init (argc, argv TAO_ENV_ARG_PARAMETER); } int @@ -85,15 +85,15 @@ Concurrency_Service::parse_args (void) int Concurrency_Service::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init\n")); 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"), @@ -108,8 +108,8 @@ Concurrency_Service::init (int argc, "Could not parse command line\n"), -1); CORBA::String_var str = - this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory (), - ACE_TRY_ENV); + this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory () + TAO_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", str.in ())); @@ -121,13 +121,13 @@ Concurrency_Service::init (int argc, } if (this->use_naming_service_) - return this->init_naming_service (ACE_TRY_ENV); + return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); return 0; } int -Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV) +Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); CORBA::ORB_var orb; @@ -141,7 +141,7 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV) if (result == -1) return result; lockset_factory_ = - this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_TRY_ENV); + this->my_concurrency_server_.GetLockSetFactory ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNaming::Name concurrency_context_name (1); @@ -149,16 +149,16 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV) concurrency_context_name[0].id = CORBA::string_dup ("CosConcurrency"); this->concurrency_context_ = - this->my_name_server_->bind_new_context (concurrency_context_name, - ACE_TRY_ENV); + this->my_name_server_->bind_new_context (concurrency_context_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNaming::Name lockset_name (1); lockset_name.length (1); lockset_name[0].id = CORBA::string_dup ("LockSetFactory"); this->concurrency_context_->bind (lockset_name, - lockset_factory_.in (), - ACE_TRY_ENV); + lockset_factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } @@ -166,12 +166,12 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV) // Run the ORB event loop. int -Concurrency_Service::run (CORBA_Environment& ACE_TRY_ENV) +Concurrency_Service::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::run (...)\n")); - 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) ACE_ERROR_RETURN ((LM_ERROR, @@ -196,16 +196,16 @@ main (int argc, char ** argv) ACE_DEBUG ((LM_DEBUG, "\n \t Concurrency Service:SERVER \n \n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - int r = concurrency_service.init (argc, argv, ACE_TRY_ENV); + int r = concurrency_service.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; - concurrency_service.run (ACE_TRY_ENV); + concurrency_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } |