diff options
Diffstat (limited to 'TAO/performance-tests/DSI_Latency/Roundtrip.cpp')
| -rw-r--r-- | TAO/performance-tests/DSI_Latency/Roundtrip.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp index c82471f6199..fb1d5cc8570 100644 --- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp +++ b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp @@ -12,12 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) } void -Roundtrip::invoke (CORBA::ServerRequest_ptr request, - CORBA::Environment &ACE_TRY_ENV) +Roundtrip::invoke (CORBA::ServerRequest_ptr request + TAO_ENV_ARG_DECL) { 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; return; @@ -26,18 +26,18 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0) { 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; CORBA::Any type_id (CORBA::_tc_string); - list->add_value ("type_id", type_id, CORBA::ARG_IN, - ACE_TRY_ENV); + list->add_value ("type_id", type_id, CORBA::ARG_IN + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - request->arguments (list, ACE_TRY_ENV); + request->arguments (list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *arg; @@ -52,7 +52,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, CORBA::Any result; result <<= CORBA::Any::from_boolean (type_matches); - request->set_result (result, ACE_TRY_ENV); + request->set_result (result TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -61,21 +61,21 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0) { 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; CORBA::Any send_time (CORBA::_tc_ulonglong); - list->add_value ("send_time", send_time, CORBA::ARG_IN, - ACE_TRY_ENV); + list->add_value ("send_time", send_time, CORBA::ARG_IN + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - request->arguments (list, ACE_TRY_ENV); + request->arguments (list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV); + CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - request->set_result (*(nv->value ()), ACE_TRY_ENV); + request->set_result (*(nv->value ()) TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -84,14 +84,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, CORBA::Any bad_operation; CORBA::BAD_OPERATION exception; bad_operation <<= exception; - request->set_exception (bad_operation, ACE_TRY_ENV); + request->set_exception (bad_operation TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::RepositoryId Roundtrip::_primary_interface (const PortableServer::ObjectId &, - PortableServer::POA_ptr, - CORBA::Environment &) + PortableServer::POA_ptr + TAO_ENV_ARG_DECL_NOT_USED) { return CORBA::string_dup ("IDL:Test/Roundtrip:1.0"); } |