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.

10 files changed, 32 insertions, 12 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6570d2e1244..8661a6a0459 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+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.
+
 Sat Mar 12 09:26:56 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * ace/config-linux-common.h:
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index a3c6c31937a..131abb65ebc 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -626,7 +626,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
                          "\t[-b base address]\n"
                          "\t[-v] (verbose)\n"
                          "\t[-r] (use Win32 Registry)\n",
-                         argv[0]);
+                         ACE_TEXT_ALWAYS_CHAR (argv[0]));
         /* NOTREACHED */
         break;
       }
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index 64dae4cd391..5fd22ca720a 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -37,7 +37,7 @@ ACE_Service_Type::dump (void) const
   ACE_OS::fprintf(stderr,
                   "// [ST] dump, this=%p, name=%s, type=%p, so=%p, active=%d\n",
                   static_cast<void const *> (this),
-                  this->name_,
+                  ACE_TEXT_ALWAYS_CHAR (this->name_),
                   static_cast<void const *> (this->type_),
                   (this->type_ != 0) ? this->type_->object () : 0,
                   this->active_);
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 6e01a715908..8bc5bc28785 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -103,7 +103,10 @@ ACE_Blob_Reader::send_request (void)
     ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
 
   // Create a message to send to the server requesting retrieval of the file
-  int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
+  int len = ACE_OS::sprintf (mesg, "%s %s %s",
+                             request_prefix_,
+                             ACE_TEXT_ALWAYS_CHAR (filename_),
+                             request_suffix_);
 
   // Send the message to server
   if (peer ().send_n (mesg, len) != len)
@@ -278,7 +281,8 @@ ACE_Blob_Writer::send_request (void)
 
   // Create the header, store the actual length in mesglen.
   mesglen = ACE_OS::sprintf (mesg, "%s /%s %s " ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "\n\n",
-                             request_prefix_, filename_, request_suffix_, length_);
+                             request_prefix_, ACE_TEXT_ALWAYS_CHAR (filename_),
+                             request_suffix_, length_);
 
   // Send the header followed by the data
 
diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp
index fb1ef8df8e1..ee7c4f3c99f 100644
--- a/ACE/apps/gperf/src/Options.cpp
+++ b/ACE/apps/gperf/src/Options.cpp
@@ -100,7 +100,7 @@ Options::print_options (void)
 
   for (i = 0; i < argc_; i++)
     ACE_OS::printf ("%s ",
-                    argv_[i]);
+                    ACE_TEXT_ALWAYS_CHAR (argv_[i]));
 
   ACE_OS::printf (" */");
 }
diff --git a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp
index ee224beab5f..514ca9a27ef 100644
--- a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp
+++ b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp
@@ -81,7 +81,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       1);
 
   ACE_OS::printf ("read back :%s\n",
-                  readback);
+                  ACE_TEXT_ALWAYS_CHAR (readback));
 
   if (cli_file.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/examples/Log_Msg/test_callback.cpp b/ACE/examples/Log_Msg/test_callback.cpp
index 17bf724fcf3..ad776bbfe1e 100644
--- a/ACE/examples/Log_Msg/test_callback.cpp
+++ b/ACE/examples/Log_Msg/test_callback.cpp
@@ -78,7 +78,7 @@ Logger::log (ACE_Log_Record &log_record)
                     log_record.msg_data ()));
       else
         ACE_OS::printf ("Recursive Logger callback = %s",
-                        log_record.msg_data ());
+                        ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ()));
     }
   else
     {
@@ -94,7 +94,7 @@ Logger::log (ACE_Log_Record &log_record)
                         verbose_msg));
           else
             ACE_OS::printf ("Recursive Logger callback = %s",
-                            verbose_msg);
+                            ACE_TEXT_ALWAYS_CHAR (verbose_msg));
         }
     }
 
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
index 714ec0f9b8c..93e710b7f88 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
@@ -22,7 +22,7 @@ static void
 print_usage_and_die (void)
 {
   ACE_OS::fprintf (stderr, "usage: %s [-p broadcast portnum]\n",
-                   program_name);
+                   ACE_TEXT_ALWAYS_CHAR (program_name));
   ACE_OS::exit (1);
 }
 
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");