diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/orbsvcs/Logging_Service | |
parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/orbsvcs/Logging_Service')
-rw-r--r-- | TAO/orbsvcs/Logging_Service/Logging_Service.cpp | 72 | ||||
-rw-r--r-- | TAO/orbsvcs/Logging_Service/Logging_Service.h | 13 |
2 files changed, 42 insertions, 43 deletions
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp index 7ba031e827d..576e9eaef6f 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp @@ -16,59 +16,59 @@ Logging_Service::~Logging_Service (void) } void -Logging_Service::init_ORB (int& argc, char *argv [], - CORBA::Environment &ACE_TRY_ENV) +Logging_Service::init_ORB (int& argc, char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_ = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_TRY_ENV); + this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Logging_Service::startup (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) +Logging_Service::startup (int argc, char *argv[] + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nStarting up the Telecom Log Service...\n")); // initalize the ORB. - this->init_ORB (argc, argv, - ACE_TRY_ENV); + this->init_ORB (argc, argv + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Resolve the naming service. - this->resolve_naming_service (ACE_TRY_ENV); + this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate the basic log factory // CORBA::Object_var obj = DsLogAdmin::BasicLogFactory_var obj = - this->basic_log_factory_.activate (this->poa_.in (), - ACE_TRY_ENV); + this->basic_log_factory_.activate (this->poa_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (obj.in ())); CORBA::String_var str = - this->orb_->object_to_string (obj.in (), ACE_TRY_ENV); + this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -82,8 +82,8 @@ Logging_Service::startup (int argc, char *argv[], name[0].id = CORBA::string_dup (this->basic_log_factory_name_); this->naming_->rebind (name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -92,11 +92,11 @@ Logging_Service::startup (int argc, char *argv[], } void -Logging_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -104,8 +104,8 @@ Logging_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -114,10 +114,10 @@ Logging_Service::run (void) { ACE_DEBUG ((LM_DEBUG, "%s: Running the Telecom Log Service\n", __FILE__)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -130,17 +130,17 @@ Logging_Service::run (void) } void -Logging_Service::shutdown (CORBA::Environment &ACE_TRY_ENV) +Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate. PortableServer::ObjectId_var oid = - this->poa_->servant_to_id (&this->basic_log_factory_, - ACE_TRY_ENV); + this->poa_->servant_to_id (&this->basic_log_factory_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. - this->poa_->deactivate_object (oid.in (), - ACE_TRY_ENV); + this->poa_->deactivate_object (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Unbind from the naming service. @@ -148,8 +148,8 @@ Logging_Service::shutdown (CORBA::Environment &ACE_TRY_ENV) name.length (1); name[0].id = CORBA::string_dup (this->basic_log_factory_name_); - this->naming_->unbind (name, - ACE_TRY_ENV); + this->naming_->unbind (name + TAO_ENV_ARG_PARAMETER); // shutdown the ORB. if (!CORBA::is_nil (this->orb_.in ())) @@ -164,8 +164,8 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { service.startup (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (service.run () == -1) diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.h b/TAO/orbsvcs/Logging_Service/Logging_Service.h index af4a9675f23..d81f88a429b 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.h @@ -39,8 +39,8 @@ class Logging_Service int parse_args (int argc, char *argv []); // Parses the command line arguments. - void startup (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV); + void startup (int argc, char *argv[] + TAO_ENV_ARG_DECL); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -48,17 +48,16 @@ class Logging_Service // run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Shutdown the Telecom Log Service. // Returns 0 on success, -1 on error. protected: - void init_ORB (int& argc, char *argv [], - CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int& argc, char *argv [] + TAO_ENV_ARG_DECL); // initialize the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Resolve the naming service. // = Data members |