ChangeLogTag: Thu Jun 19 11:13:00 UTC 2008 Simon Massey <sma at prismtech dot com>

5 files changed, 32 insertions, 43 deletions

diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 2a9adc23d04..d103eecb0b2 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -35,7 +35,7 @@ ACE_RCSID (Anyop,
            "$Id$")
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -50,9 +50,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       ACE_Get_Opt get_opt (argc, argv, "dien:");
       int opt;
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index 0e504d31c0e..b1e42a3efb3 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -78,7 +78,7 @@ static int measure_reverse_map_effectiveness = 0;
 static u_long iterations = 1000;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "i:r");
   int c;
@@ -228,9 +228,8 @@ public:
     this->timer_.elapsed_time (elapsed_time);
 
     // compute average time.
-    ACE_DEBUG ((LM_DEBUG,
-                "\n%s stats...\n",
-                this->test_name_));
+    ACE_DEBUG ((LM_DEBUG, "\n%s stats...\n",
+                ACE_TEXT_CHAR_TO_TCHAR (this->test_name_)));
     print_stats (elapsed_time);
   }
 
@@ -329,15 +328,13 @@ child_poa_testing (PortableServer::POA_ptr root_poa)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index cc20361a506..a7abff92b8d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -10,12 +10,12 @@
 #include "tao/debug.h"
 #include "testS.h"
 
-static const char *ior_file = "distributor.ior";
-static const char *ior = "file://receiver.ior";
+static const ACE_TCHAR *ior_file = ACE_TEXT ("distributor.ior");
+static const ACE_TCHAR *ior = ACE_TEXT ("file://receiver.ior");
 static int number_of_connection_attempts = 20;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:k:");
   int c;
@@ -306,14 +306,12 @@ test_i::shutdown (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB");
@@ -342,7 +340,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         root_poa->the_POAManager ();
 
       object =
-        orb->string_to_object (ior);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var receiver =
         test::_narrow (object.in ());
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index a66ebb978c7..880a77a0646 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -11,13 +11,13 @@
 #include "tao/debug.h"
 #include "testS.h"
 
-static const char *ior_file = "receiver.ior";
+static const ACE_TCHAR *ior_file = ACE_TEXT ("receiver.ior");
 static int do_dump_history = 0;
 static int print_missed_invocations = 0;
 static ACE_UINT32 gsf = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "d:f:m:");
   int c;
@@ -134,7 +134,7 @@ test_i::start_test (CORBA::Long session_id,
 
   ACE_DEBUG ((LM_DEBUG,
               "Protocol = %5s Invocation Rate = %3d Message Size = %5d Expected Latency = %4d ",
-              protocol,
+              ACE_TEXT_CHAR_TO_TCHAR (protocol),
               invocation_rate,
               message_size,
               1000 / invocation_rate));
@@ -325,16 +325,14 @@ test_i::shutdown (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int parse_args_result =
         parse_args (argc, argv);
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index c266954aa60..3c6c758f08f 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -28,7 +28,7 @@ enum Test_Type
     LATENCY
   };
 
-static const char *ior = "file://distributor.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://distributor.ior");
 static int shutdown_server = 0;
 static CORBA::ULong iterations = 5;
 static CORBA::ULong invocation_rate = 5;
@@ -37,7 +37,7 @@ static ACE_UINT32 gsf = 0;
 static int do_dump_history = 0;
 static int print_missed_invocations = 0;
 static CORBA::ULong message_size = 0;
-static const char *test_protocol = "IIOP";
+static const ACE_TCHAR *test_protocol = ACE_TEXT ("IIOP");
 static int print_statistics = 1;
 static int number_of_connection_attempts = 20;
 static int enable_diffserv_code_points = 0;
@@ -45,7 +45,7 @@ static RTCORBA::Priority corba_priority = RTCORBA::minPriority;
 static Test_Type test_type = PACED;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:");
   int c;
@@ -107,17 +107,17 @@ parse_args (int argc, char **argv)
 
       default:
         {
-          const char *test = 0;
+          const ACE_TCHAR *test = 0;
           switch (test_type)
             {
             case PACED:
-              test = "PACED";
+              test = ACE_TEXT ("PACED");
               break;
             case THROUGHPUT:
-              test = "THROUGHPUT";
+              test = ACE_TEXT ("THROUGHPUT");
               break;
             case LATENCY:
-              test = "LATENCY";
+              test = ACE_TEXT ("LATENCY");
               break;
             }
 
@@ -269,12 +269,12 @@ Worker::Worker (CORBA::ORB_ptr orb,
   this->base_protocol_policy_[0] =
     this->rtorb_->create_client_protocol_policy (protocols);
 
-  if (ACE_OS::strcmp (test_protocol, "DIOP") == 0)
+  if (ACE_OS::strcmp (test_protocol, ACE_TEXT ("DIOP")) == 0)
     {
       if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "test protocol is DIOP\n"));
       protocols[0].protocol_type = TAO_TAG_DIOP_PROFILE;
     }
-  else if (ACE_OS::strcmp (test_protocol, "SCIOP") == 0)
+  else if (ACE_OS::strcmp (test_protocol, ACE_TEXT ("SCIOP")) == 0)
     {
       if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "test protocol is SCIOP\n"));
       protocols[0].protocol_type = TAO_TAG_SCIOP_PROFILE;
@@ -512,7 +512,7 @@ Worker::setup (void)
         {
           // Let the server know what to expect..
           this->test_->start_test (this->session_id_,
-                                   test_protocol,
+                                   ACE_TEXT_ALWAYS_CHAR (test_protocol),
                                    invocation_rate,
                                    message_size,
                                    iterations);
@@ -644,7 +644,7 @@ Worker::run (void)
   // This call is used to ensure that all the THROUGHPUT related data
   // has reached the server.
   if (test_type == THROUGHPUT &&
-      ACE_OS::strcmp (test_protocol, "DIOP") != 0)
+      ACE_OS::strcmp (test_protocol, ACE_TEXT ("DIOP")) != 0)
     {
       this->test_->twoway_sync ();
     }
@@ -661,16 +661,14 @@ Worker::run (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB");
@@ -711,7 +709,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       mapping_manager->mapping (cnpm);
 
       object =
-        orb->string_to_object (ior);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var test =
         test::_narrow (object.in ());