diff options
Diffstat (limited to 'TAO/tests/DSI_Gateway/test_dsi.cpp')
| -rw-r--r-- | TAO/tests/DSI_Gateway/test_dsi.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 4a96384e624..a278997774d 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -11,21 +11,21 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$") void -DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, - CORBA::Environment &ACE_TRY_ENV) +DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::NVList_ptr list; - this->orb_->create_list (0, list, ACE_TRY_ENV); + this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - request->arguments (list, ACE_TRY_ENV); + request->arguments (list TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Request_var target_request; @@ -37,8 +37,8 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, 0, // exception_list, 0, // context_list, target_request.inout (), - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; target_request->_tao_lazy_evaluation (1); @@ -49,7 +49,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, ACE_TRY { // Updates the byte order state, if necessary. - target_request->invoke (ACE_TRY_ENV); + target_request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UNKNOWN, ex) @@ -71,15 +71,15 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, CORBA::RepositoryId DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, - PortableServer::POA_ptr, - CORBA::Environment &) + PortableServer::POA_ptr + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()) { return CORBA::string_dup ("IDL:Simple_Server:1.0"); } PortableServer::POA_ptr -DSI_Simple_Server::_default_POA (CORBA::Environment &) +DSI_Simple_Server::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } |