1 files changed, 15 insertions, 29 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
index f7be48d6140..5c13f7380ae 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -14,13 +14,11 @@ void
 Roundtrip::test_octet_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::octet_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Octet_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_octet_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_octet_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -28,13 +26,11 @@ void
 Roundtrip::test_long_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::long_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Long_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_long_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_long_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -42,13 +38,11 @@ void
 Roundtrip::test_short_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::short_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Short_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_short_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_short_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -56,13 +50,11 @@ void
 Roundtrip::test_char_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::char_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Char_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_char_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_char_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -71,13 +63,11 @@ void
 Roundtrip::test_longlong_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::longlong_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Longlong_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_longlong_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_longlong_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -85,23 +75,19 @@ void
 Roundtrip::test_double_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::double_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Double_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_double_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_double_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);
 }