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.

3 files changed, 4 insertions, 4 deletions

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);
 }