ChangeLogTag: Wed Feb 11 02:15:21 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>prism_import

8 files changed, 17 insertions, 21 deletions

diff --git a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index ecfc64d6865..c684bcc1ebe 100644
--- a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -24,14 +24,13 @@ const char *ior4 = "file://comp4.ior";
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj1
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
index 3fcf634906e..1f105b46051 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
@@ -24,7 +24,7 @@ module Benchmark
    * define the component executor interface explicitly here.
    */
   local interface RoundTrip_Exec : CCM_RoundTrip, CCM_LatencyTest,
-                                 Components::SessionComponent
+                                   Components::SessionComponent
   {
   };
 
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 218db8f4ae9..0b98f53156c 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -27,11 +27,12 @@ int niterations = 100;
 int do_dump_history = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  //parse arguments
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  char c;
+  // Parse arguments.
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:"));
+  int c;
+  
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -52,6 +53,7 @@ parse_args (int argc, char *argv[])
         /* Could be any other parameter like -ORBSvcConf file so ignore */
        break;
       }
+      
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -83,7 +85,7 @@ set_priority ()
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -91,8 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       set_priority();
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args(argc, argv) == -1)
         {
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 98281dfadcc..5d75029d1bb 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,14 +18,13 @@
 const char *ior = "file://test.ior";
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj
diff --git a/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index dd541d0d8c6..95293293f3a 100644
--- a/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -29,7 +29,7 @@ static const char *test_type = "PACED";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index cded99657e5..9e806b77f9c 100644
--- a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -218,9 +218,7 @@ namespace CIDL_ReceiverImpl
     char **argv = 0;
 
     this->orb_ =
-      CORBA::ORB_init (argc,
-                      argv);
-
+      CORBA::ORB_init (argc, argv);
   }
 
   ::Protocols::CCM_test_ptr
diff --git a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index ea25575a497..da68ddafb7b 100644
--- a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -582,8 +582,7 @@ CIDL_SenderImpl::SenderExec_i::start (
   char **argv = 0;
 
   this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv);
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB");
diff --git a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
index df62ac2c87c..8c3a1529975 100644
--- a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
+++ b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
@@ -30,7 +30,7 @@ int do_dump_history = 0;
 int niterations = 1000;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   //parse arguments
   ACE_Get_Opt get_opts (argc, argv, "hxi:");