Thu Apr 9 13:20:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/tests/ObjectLocatorTest/srv_main.cpp
        * DAnCE/tests/RedirectionServiceTest/srv_main.cpp
        * examples/Hello/Sender/starter.cpp
        * performance-tests/Protocols/Controller/Controller.cpp
          Unicode changes

5 files changed, 19 insertions, 11 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fd2bfe3e1d4..8b2bc6aba3c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,10 +1,18 @@
+Thu Apr  9 13:20:22 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/tests/ObjectLocatorTest/srv_main.cpp
+        * DAnCE/tests/RedirectionServiceTest/srv_main.cpp
+        * examples/Hello/Sender/starter.cpp
+        * performance-tests/Protocols/Controller/Controller.cpp
+          Unicode changes
+
 Wed Apr  8 23:11:22 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * examples/Hello/descriptors/DeploymentPlan.cdp:
 
           Removed some unicode characters that may be causing problems
-          on some platforms. 
-        
+          on some platforms.
+
 Wed Apr  8 18:14:30 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * ciao/Containers/Servant_Activator.cpp:
diff --git a/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp b/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
index c7e32ebe0b7..344b3013c44 100644
--- a/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
+++ b/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
@@ -23,7 +23,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
       ACE_TCHAR buf1[32];
       ACE_OS::sprintf (buf1, ACE_TEXT("-ORBListenEndpoints"));
       argvm[argcm-2] = buf1;
-      char buf2[32];
+      ACE_TCHAR buf2[32];
       ACE_OS::sprintf (buf2, ACE_TEXT("iiop://:12345"));
       argvm[argcm-1] = buf2;
       argvm[argcm] = 0;
diff --git a/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp b/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
index 332747011aa..12f9f66302e 100644
--- a/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
+++ b/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
@@ -16,7 +16,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 //    try
   {
     int argcm = argc + 2;
-    ACE_TCHAR ** argvm = new char* [argcm+1];
+    ACE_TCHAR ** argvm = new ACE_TCHAR* [argcm+1];
     for (int i = 0; i < argc; ++i)
       {
         argvm[i] = argv[i];
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index aa86af6b0ec..610ee410d11 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -18,7 +18,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'k':
-          ior = get_opts.opt_arg ();
+          ior = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
           break;
 
         case 'm':
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index a2320772c61..6ec5831cb35 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -7,9 +7,9 @@
 #include "ace/OS_NS_string.h"
 
 
-static const char *sender_ior = "file://sender.ior";
-static const char *distributor_ior = "file://distributor.ior";
-static const char *receiver_ior = "file://receiver.ior";
+static const ACE_TCHAR *sender_ior = ACE_TEXT("file://sender.ior");
+static const ACE_TCHAR *distributor_ior = ACE_TEXT("file://distributor.ior");
+static const ACE_TCHAR *receiver_ior = ACE_TEXT("file://receiver.ior");
 static int shutdown_sender = 0;
 static int shutdown_distributor = 0;
 static int shutdown_receiver = 0;
@@ -24,7 +24,7 @@ static int print_statistics = 1;
 static int number_of_connection_attempts = 20;
 static int enable_diffserv_code_points = 0;
 static int corba_priority = 0;
-static const char *test_type = "PACED";
+static const ACE_TCHAR *test_type = ACE_TEXT("PACED");
 
 static int
 parse_args (int argc, ACE_TCHAR **argv)
@@ -178,9 +178,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         test_protocol_tag = TAO_TAG_SCIOP_PROFILE;
 
       Protocols::Sender_Controller::Test_Type test_type_tag = Protocols::Sender_Controller::PACED;
-      if (ACE_OS::strcmp (test_type, "THROUGHPUT") == 0)
+      if (ACE_OS::strcmp (test_type, ACE_TEXT("THROUGHPUT")) == 0)
         test_type_tag = Protocols::Sender_Controller::THROUGHPUT;
-      else if (ACE_OS::strcmp (test_type, "LATENCY") == 0)
+      else if (ACE_OS::strcmp (test_type, ACE_TEXT("LATENCY")) == 0)
         test_type_tag = Protocols::Sender_Controller::LATENCY;
 
       sender->start (iterations,