diff options
Diffstat (limited to 'TAO/examples/Logging/Logging_Service_i.cpp')
| -rw-r--r-- | TAO/examples/Logging/Logging_Service_i.cpp | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 3b65ab4da94..2ed175d878d 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -43,8 +43,7 @@ Logger_Server::parse_args (void) int Logger_Server::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { this->argc_ = argc; this->argv_ = argv; @@ -53,17 +52,14 @@ Logger_Server::init (int argc, // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER) == -1) + "child_poa") == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1); - ACE_CHECK_RETURN (-1); - this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_manager_.activate_poa_manager (); // Parse the command line arguments. if (this->parse_args () != 0) @@ -75,16 +71,14 @@ Logger_Server::init (int argc, // Activate the logger_factory. CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("logger_factory", - &this->factory_impl_ - ACE_ENV_ARG_PARAMETER); + &this->factory_impl_); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", str.in ())); // Initialize the naming service - int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int ret = this->init_naming_service (); if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", @@ -99,7 +93,7 @@ Logger_Server::init (int argc, // and logger_factory object. int -Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) +Logger_Server::init_naming_service () { // Get pointers to the ORB and child POA CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -109,26 +103,22 @@ Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SIN return -1; // Create an instance of the Logger_Factory - Logger_Factory_var factory = this->factory_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + Logger_Factory_var factory = this->factory_impl_._this (); //Register the logger_factory CosNaming::Name factory_name (1); factory_name.length (1); factory_name[0].id = CORBA::string_dup ("Logger_Factory"); this->my_name_server_->bind (factory_name, - factory.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + factory.in ()); return 0; } int -Logger_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Logger_Server::run (void) { - int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int ret = this->orb_manager_.run (); if (ret == -1) ACE_ERROR_RETURN ((LM_ERROR, "Logger_Server::run"), |