diff options
Diffstat (limited to 'TAO/examples/Simple/echo/Echo_i.cpp')
| -rw-r--r-- | TAO/examples/Simple/echo/Echo_i.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index 9f9a5c3fc92..dc65c299d82 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -33,8 +33,8 @@ Echo_i::orb (CORBA::ORB_ptr o) // Return a list of object references. Echo::List * -Echo_i::echo_list (const char *, - CORBA::Environment &ACE_TRY_ENV) +Echo_i::echo_list (const char * + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Echo::List_var list; @@ -53,18 +53,18 @@ Echo_i::echo_list (const char *, // Just do something to get a list of object references. list[CORBA::ULong(0)] = - orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); list[CORBA::ULong(1)] = - orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV);; + orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER);; ACE_CHECK_RETURN (0); list[CORBA::ULong(2)] = - orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return list._retn (); @@ -73,8 +73,8 @@ Echo_i::echo_list (const char *, // Return the mesg string from the server char * -Echo_i::echo_string (const char *mesg, - CORBA::Environment &ACE_TRY_ENV) +Echo_i::echo_string (const char *mesg + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The pointer mesg was NULL, return. @@ -100,7 +100,7 @@ Echo_i::echo_string (const char *mesg, // Shutdown the server application. void -Echo_i::shutdown (CORBA::Environment &) +Echo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, |