diff options
Diffstat (limited to 'TAO/examples/Simple/echo')
| -rw-r--r-- | TAO/examples/Simple/echo/Echo_Client_i.cpp | 5 | ||||
| -rw-r--r-- | TAO/examples/Simple/echo/Echo_i.cpp | 5 | ||||
| -rw-r--r-- | TAO/examples/Simple/echo/Echo_i.h | 2 | ||||
| -rw-r--r-- | TAO/examples/Simple/echo/server.cpp | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp index 67088738cf4..904f89ce70c 100644 --- a/TAO/examples/Simple/echo/Echo_Client_i.cpp +++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp @@ -45,7 +45,6 @@ Echo_Client_i::run (const char *name, CORBA::String_var s = client->echo_string (buf ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nString echoed by client \n%s\n", @@ -53,9 +52,8 @@ Echo_Client_i::run (const char *name, } if (client.shutdown () == 1) - client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -64,7 +62,6 @@ Echo_Client_i::run (const char *name, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index aeef101e78d..9a3a44d19d7 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -49,17 +49,14 @@ Echo_i::echo_list (const char * list[CORBA::ULong(0)] = orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); list[CORBA::ULong(1)] = orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);; - ACE_CHECK_RETURN (0); list[CORBA::ULong(2)] = orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return list._retn (); } @@ -94,7 +91,7 @@ Echo_i::echo_string (const char *mesg // Shutdown the server application. void -Echo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index 1b782cce796..1ee78f98e33 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -50,7 +50,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Return the mesg string back from the server. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index b74d5bc7af6..e9fc68e8197 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -23,8 +23,7 @@ main (int argc, char *argv[]) return 1; else { - server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server.run (); } } ACE_CATCH (CORBA::UserException, userex) |