ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 25 insertions, 34 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 455abac1fdb..f1b31f293b2 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -96,7 +96,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -117,8 +117,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_octet_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_octet_method");
 
           request[j]->add_in_arg ("octet_load") <<= ol;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -166,7 +165,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_long_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -187,8 +186,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_long_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_long_method");
 
           request[j]->add_in_arg ("long_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -236,7 +234,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_short_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -257,8 +255,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_short_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_short_method");
 
           request[j]->add_in_arg ("short_load") <<= sl;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -306,7 +303,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_char_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -327,8 +324,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_char_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_char_method");
 
           request[j]->add_in_arg ("char_load") <<= cl;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -376,7 +372,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_longlong_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -397,8 +393,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_longlong_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_longlong_method");
 
           request[j]->add_in_arg ("longlong_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -446,7 +441,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_double_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -467,8 +462,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_double_method"
-                                 ACE_ENV_ARG_PARAMETER);
+            roundtrip->_request ("test_double_method");
 
           request[j]->add_in_arg ("double_load") <<= dl;
           request[j]->add_in_arg ("send_time") <<= start;
@@ -541,19 +535,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -569,8 +563,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
+                                               start);
         }
 
 
@@ -578,27 +571,27 @@ main (int argc, char *argv[])
 
           if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_octet_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_char_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_long_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_short_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_double_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+          test_longlong_seq (roundtrip.in ());
         }
 
       if (do_shutdown)
@@ -606,13 +599,11 @@ main (int argc, char *argv[])
           roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }