Wed Jun 5 20:11:23 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

        * examples/AMI/FL_Callback/progress.cpp:

        * orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp:

        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:

        * tests/FL_Cube/server.cpp:

        * tests/QtTests/client.cpp:
        * tests/QtTests/server.cpp:

          Fixed wchar build compile errors

7 files changed, 38 insertions, 18 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dd3b8ac1edc..12564d4769d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun  5 20:11:23 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/AMI/FL_Callback/progress.cpp:
+
+        * orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp:
+
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+
+        * tests/FL_Cube/server.cpp:
+
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/server.cpp:
+
+          Fixed wchar build compile errors
+
 Tue Jun  4 19:30:32 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/LiveCheck.cpp:
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 341b6af910f..a2ebfb494da 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -73,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       window.end ();
 
-      char* targv[] = { argv[0] };
+      char* targv[] = { ACE_TEXT_ALWAYS_CHAR (argv[0]) };
       window.show (1, targv);
 
       sw.show ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
index ec65d4c619d..ab5da467c1c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
@@ -66,15 +66,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       for (int i = 1; i < argc; i++)
         {
           ACE_TCHAR *c = argv[i];
-          if (ACE_OS::strcasecmp ("-n", c) == 0)
+          if (ACE_OS::strcasecmp (ACE_TEXT ("-n"), c) == 0)
             {
               server_num = ACE_OS::atoi (argv[++i]);
             }
-          else if (ACE_OS::strcasecmp ("-?",c) == 0)
+          else if (ACE_OS::strcasecmp (ACE_TEXT ("-?"),c) == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "usage: %s "
-                          "-n Number of the server\n",
+                          ACE_TEXT ("usage: %C ")
+                          ACE_TEXT ("-n Number of the server\n"),
                           argv[0]));
               return 1;
             }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 1ae4f59307d..cbd698f6a6e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -21,6 +21,7 @@
 #endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "server.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Sched_Params.h"
 #include "tao/Strategies/advanced_resource.h"
 
@@ -171,17 +172,17 @@ Server::write_iors (void)
 int
 Server::activate_high_servant (void)
 {
-  char orbendpoint[BUFSIZ];
+  ACE_TCHAR orbendpoint[BUFSIZ];
 
-  ACE_OS::sprintf (orbendpoint,
-                   "-ORBEndpoint %s ",
-                   ACE_TEXT_ALWAYS_CHAR (GLOBALS::instance ()->endpoint));
+  ACE_OS::strcpy (orbendpoint, ACE_TEXT ("-ORBEndpoint "));
+  ACE_OS::strcat (orbendpoint, GLOBALS::instance ()->endpoint);
 
-  char *high_second_argv[] =
-    {orbendpoint,
-     const_cast<char *> ("-ORBSndSock 32768 "),
-     const_cast<char *> ("-ORBRcvSock 32768 "),
-     0};
+  ACE_TCHAR *high_second_argv[] =
+    { orbendpoint,
+      const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBSndSock 32768 ")),
+      const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBRcvSock 32768 ")),
+      ACE_TEXT (0)
+    };
   ACE_NEW_RETURN (this->high_argv_,
                   ACE_ARGV (this->argv_, high_second_argv),
                   -1);
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 06ab83c9456..8887b07b328 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      char* targv[] = { argv[0] };
+      char* targv[] = { ACE_TEXT_ALWAYS_CHAR (argv[0]) };
       window.show (1, targv);
 
       sw.show ();
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index d4f549290d7..55261dcb1a1 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/QtResource/QtResource_Loader.h"
 
 #include "client.h"
@@ -9,9 +10,10 @@
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  QApplication app (argc, argv);
-  TAO::QtResource_Loader qt_resources (&app);
 
+  ACE_Argv_Type_Converter ct (argc, argv);
+  QApplication app (argc,  ct.get_ASCII_argv ());
+  TAO::QtResource_Loader qt_resources (&app);
 
   try
     {
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 6552506e4b8..63101f832b2 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 // who defines index macro?
 #ifdef index
@@ -52,7 +53,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return 1;
 
   // Qt specific stuff for running with TAO...
-  QApplication app (argc, argv);
+  ACE_Argv_Type_Converter ct (argc, argv);
+  QApplication app (argc,  ct.get_ASCII_argv());
   TAO::QtResource_Loader qt_resources (&app);
 
   try