1 files changed, 14 insertions, 30 deletions

diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index 5cd2f655186..950ca0f7eff 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -15,13 +15,11 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
 
       return;
     }
@@ -29,20 +27,15 @@ 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_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
       CORBA::Any type_id;
       type_id._tao_set_typecode (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("type_id", type_id, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (0);
 
       const char *arg;
       *(nv->value ()) >>= arg;
@@ -56,8 +49,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (result);
 
       return;
     }
@@ -65,23 +57,17 @@ 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_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
       CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (0);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -89,14 +75,12 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->set_exception (bad_operation);
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               PortableServer::POA_ptr)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }