1 files changed, 14 insertions, 28 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index 072b7a2888a..c875e14828e 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -23,38 +23,31 @@ Client_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       if (ACE_OS::strcmp (this->data_type_.in (), "octet") == 0 )
         {
-          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_octet_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "long") == 0 )
         {
-          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_long_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "short") == 0 )
         {
-          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_short_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "char") == 0 )
         {
-          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_char_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "longlong") == 0 )
         {
-          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_longlong_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "double") == 0 )
         {
-          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_double_seq ();
         }
     }
   ACE_CATCHANY
@@ -75,7 +68,7 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
@@ -85,14 +78,13 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           (void) this->roundtrip_->test_octet_method (oc, dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
     }
 }
 
 void
-Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_octet_seq (void)
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -102,7 +94,6 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -111,7 +102,7 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_long_seq (void)
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -121,7 +112,6 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -131,7 +121,7 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_short_seq (void)
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -141,7 +131,6 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -150,7 +139,7 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_char_seq (void)
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -160,7 +149,6 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -169,7 +157,7 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_longlong_seq (void)
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -179,7 +167,6 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -188,7 +175,7 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_double_seq (void)
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -198,7 +185,6 @@ Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
       (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);