diff options
Diffstat (limited to 'TAO/examples/Simple/chat/Server_i.cpp')
| -rw-r--r-- | TAO/examples/Simple/chat/Server_i.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index 208a440ad86..651990e7ebb 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -60,29 +60,24 @@ Server_i::parse_args (int argc, char *argv[]) int Server_i::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { // Parse the command line options. if (this-> parse_args(argc, argv) == -1) return -1; if (this->orb_manager_.init (argc, - argv - ACE_ENV_ARG_PARAMETER) == -1) + argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb manager init failed\n"), -1); - ACE_CHECK_RETURN (-1); CORBA::ORB_var orb = this->orb_manager_.orb (); // Activate the servant. CORBA::String_var str = - this->orb_manager_.activate (&this->broadcaster_i_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_manager_.activate (&this->broadcaster_i_); // Write the IOR to a file. this->write_IOR (str.in ()); @@ -90,14 +85,13 @@ Server_i::init (int argc, } int -Server_i::run (ACE_ENV_SINGLE_ARG_DECL) +Server_i::run (void) { ACE_DEBUG ((LM_DEBUG, "Running chat server...\n")); // Run the main event loop for the ORB. - 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, "Server_i::run"), |