1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
index 1d5e7f07ee2..c06f2da81c8 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -13,23 +13,19 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 void
 Roundtrip::test_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
 void
 Roundtrip::shutdown (
-       Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-       ACE_ENV_ARG_DECL_NOT_USED)
+       Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->shutdown ();
+  this->orb_->shutdown (0);
 }