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, 7 insertions, 9 deletions
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index 5194253d1d5..b5e4baa2a71 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -60,7 +60,7 @@ Server_i::parse_args (int argc, char *argv[]) int Server_i::init (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &env) { // Parse the command line options. if (this-> parse_args(argc, argv) == -1) @@ -68,34 +68,32 @@ Server_i::init (int argc, if (this->orb_manager_.init (argc, argv, - ACE_TRY_ENV) == -1) + env) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb manager init failed\n"), -1); - ACE_CHECK_RETURN (-1); - + TAO_CHECK_ENV_RETURN (env, + -1); CORBA::ORB_var orb = this->orb_manager_.orb (); // Activate the servant. CORBA::String_var str = this->orb_manager_.activate (&this->broadcaster_i_, - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - + env); // Write the IOR to a file. this->write_IOR (str.in ()); return 0; } int -Server_i::run (CORBA::Environment &ACE_TRY_ENV) +Server_i::run (CORBA::Environment &env) { ACE_DEBUG ((LM_DEBUG, "Running chat server...\n")); // Run the main event loop for the ORB. - if (this->orb_manager_.run (ACE_TRY_ENV) == -1) + if (this->orb_manager_.run (env) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1); |