Sun Mar 13 09:37:13 UTC 2011 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * ace/Service_Object.cpp:
        * ace/Naming_Context.cpp:
        * performance-tests/UDP/udp_test.cpp:
        * performance-tests/SCTP/Options_Manager.cpp:
        * apps/gperf/src/Options.cpp:
        * apps/JAWS/clients/Blobby/Blob_Handler.cpp:
        * examples/Log_Msg/test_callback.cpp:
        * examples/IPC_SAP/FILE_SAP/client.cpp:
        * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp:
          Fixed compile warnings from incorrect use of ACE_TCHAR* type in
          printf in wchar builds.

2 files changed, 5 insertions, 3 deletions

diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp
index d85fcfd7acf..959e5aaaee8 100644
--- a/ACE/performance-tests/SCTP/Options_Manager.cpp
+++ b/ACE/performance-tests/SCTP/Options_Manager.cpp
@@ -461,7 +461,8 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set)
   // Show usage message.  KEEP THE DEFAULTS DISPLAYED HERE IN SYNC
   // WITH THE DEFAULTS SET AT THE BEGINNING OF THE CONSTRUCTOR.
 
-  ACE_OS::fprintf (out, "%s - Measures round trip latency statistics of ACE synchronous\n", __program_name);
+  ACE_OS::fprintf (out, "%s - Measures round trip latency statistics of ACE synchronous\n",
+                   ACE_TEXT_ALWAYS_CHAR (__program_name));
   // indent past program name
   for (unsigned int i=0;i<ACE_OS::strlen(__program_name);++i)
     ACE_OS::fprintf (out, " ");
@@ -473,7 +474,8 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set)
     ACE_OS::fprintf (out, "   messaging (SOCK_SEQPACK) using unmarshalled ACE_CDR::Octet.\n");
   }
 
-  ACE_OS::fprintf (out, "USAGE: %s [ -<flag> [<val>] | --<name> [<val>] ]...\n\n", __program_name);
+  ACE_OS::fprintf (out, "USAGE: %s [ -<flag> [<val>] | --<name> [<val>] ]...\n\n",
+                   ACE_TEXT_ALWAYS_CHAR (__program_name));
 
   if (!ACE_OS::strcmp (ACE_TEXT ("client-opts"), opts_set)){
     ACE_OS::fprintf (out,   "  Flag  Args           Option-Name                 Default\n"
diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp
index bf0351184f0..37e008e5b67 100644
--- a/ACE/performance-tests/UDP/udp_test.cpp
+++ b/ACE/performance-tests/UDP/udp_test.cpp
@@ -437,7 +437,7 @@ Client::run (void)
       for (; *cmd; cmd++)
         ACE_OS::fprintf (sumfp,
                          "%s ",
-                         *cmd);
+                         ACE_TEXT_ALWAYS_CHAR (*cmd));
       ACE_OS::fprintf (sumfp,
                        "\n");