ChangeLogTag: Tue Jun 17 14:54:00 UTC 2008 Simon Massey <sma at prismtech dot com>

12 files changed, 94 insertions, 98 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 736bb3fbc9a..fb0ece2529f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,25 +1,41 @@
+Tue Jun 17 14:54:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * tests/Leader_Followers/client.cpp:
+        * tests/Nested_Event_Loop/client.cpp:
+        * tests/Param_Test/anyop.cpp:
+        * tests/POA/Generic_Servant/client.cpp:
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
+        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp:
+        * tests/POA/NewPOA/NewPOA.cpp:
+        * tests/POA/POA_BiDir/POA_BiDir.cpp:
+        * tests/POA/Persistent_ID/client.cpp:
+        * tests/POA/Reference_Counted_Servant/server.cpp:
+        * tests/OctetSeq/OctetSeq.cpp:
+
+          Wide character build fixes.
+
 Tue Jun 17 13:55:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
-        * TAO/examples/Borland/ChatClientWnd.cpp:
-        * TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-        * TAO/orbsvcs/Naming_Service/Naming_Service.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
-        * TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp:
-        * TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
-        * TAO/tests/Bug_3315_Regression/main.cpp:
-        * TAO/tests/Bug_3321_Regression/main.cpp:
-        * TAO/tests/CSD_Collocation/Collocation_Tester.cpp:
-        * TAO/tests/File_IO/File_i.cpp:
-        * TAO/tests/Object_Loader/driver.cpp:
-        * TAO/tests/POA/Forwarding/server.cpp:
-        * TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp:
-        * TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptor.cpp:
-        * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp:
-        * TAO/tests/Reliable_Oneways/client.cpp:
-        * TAO/tests/RTCORBA/ORB_init/ORB_init.cpp:
-        * TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp:
-        * TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * examples/Borland/ChatClientWnd.cpp:
+        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
+        * orbsvcs/Naming_Service/Naming_Service.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp:
+        * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
+        * tests/Bug_3315_Regression/main.cpp:
+        * tests/Bug_3321_Regression/main.cpp:
+        * tests/CSD_Collocation/Collocation_Tester.cpp:
+        * tests/File_IO/File_i.cpp:
+        * tests/Object_Loader/driver.cpp:
+        * tests/POA/Forwarding/server.cpp:
+        * tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptor.cpp:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp:
+        * tests/Reliable_Oneways/client.cpp:
+        * tests/RTCORBA/ORB_init/ORB_init.cpp:
+        * tests/RTCORBA/Client_Propagated/interceptors.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
 
           Wide character build fixes.
 
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index ff6bd28fb07..52c9b70a124 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -24,7 +24,7 @@
 ACE_RCSID(Leader_Followers, client, "$Id$")
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Number of client threads.
 static int number_of_client_threads = 3;
@@ -43,7 +43,7 @@ static u_long event_loop_timeout = 7000;
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:c:e:w:t:x");
   int c;
@@ -225,16 +225,14 @@ private:
 };
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -243,7 +241,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <server> reference.
       test_var server = test::_narrow (object.in ());
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 40080454ab8..94c45a8ae44 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID(Nested_Event_Loop, client, "$Id$")
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Default event_loop_depth.
 static CORBA::ULong event_loop_depth = 6;
@@ -22,7 +22,7 @@ static CORBA::ULong event_loop_iterations = 6;
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:d:i:x");
   int c;
@@ -68,16 +68,14 @@ parse_args (int argc, char **argv)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -96,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       // Get an object reference from the argument string.
-      object = orb->string_to_object (IOR);
+      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <server> reference.
       server_var server_object = server::_narrow (object.in ());
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 15108829c12..91541e05a9c 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -95,7 +95,7 @@ int
 run (char* buf, size_t bufsize,
      size_t n, size_t lo, size_t s,
      int quiet,
-     const char* name,
+     const ACE_TCHAR* name,
      Writer writer, Reader reader)
 {
   size_t count = 0;
@@ -161,13 +161,11 @@ run (char* buf, size_t bufsize,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int n = 64;
       int lo = 128;
@@ -235,12 +233,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (run (buf, hi,
                n, lo, s, quiet,
-               "OCTET", test_write_octet, test_read_octet) != 0)
+               ACE_TEXT ("OCTET"), test_write_octet, test_read_octet) != 0)
         return 1;
 
       if (run (buf, hi,
                n, lo, s, quiet,
-               "CHAR", test_write_char, test_read_char) != 0)
+               ACE_TEXT ("CHAR"), test_write_char, test_read_char) != 0)
         return 1;
       delete[] buf;
     }
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index 303cd6b7554..a5502730e05 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
 ACE_RCSID(Generic_Servant, client, "$Id$")
 
-static char *IOR = 0;
+static ACE_TCHAR *IOR = 0;
 static int iterations = 1;
 static int oneway = 0;
 static int shutdown_server = 0;
@@ -15,7 +16,7 @@ static CORBA::ULong timeout = 5;
 static int timed_method = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:k:i:T:otx");
   int c;
@@ -104,16 +105,14 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
@@ -123,7 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a test reference.
       test_var test = test::_narrow (object.in ());
@@ -133,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nConnecting to: %s\n\n",
-                  ior.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
 
       ACE_Profile_Timer timer;
       ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 77ac6f328d8..5978c2b8aee 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -228,16 +228,14 @@ overwrite_servant_manager (PortableServer::POA_ptr poa)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int retval = 0;
 
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index eac9a6a1f24..01961ebc2ee 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -196,14 +196,12 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index 565b2dfee78..161d90730d1 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -43,7 +43,7 @@ print_poa (PortableServer::POA_ptr poa)
 
   ACE_DEBUG ((LM_DEBUG,
               "POA name = %s\n",
-              poa_name.in ()));
+              ACE_TEXT_CHAR_TO_TCHAR (poa_name.in ())));
 
   ACE_DEBUG ((LM_DEBUG,
               "POA id = "));
@@ -72,15 +72,13 @@ print_poa (PortableServer::POA_ptr poa)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
@@ -149,10 +147,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n%s\n",
-                  root_poa_name.in (),
-                  first_poa_name.in (),
-                  second_poa_name.in (),
-                  third_poa_name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (root_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (first_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (second_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (third_poa_name.in ())));
 
       print_poa (root_poa.in ());
 
diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
index 5dbd2c5722b..598eb6fe11f 100644
--- a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
@@ -41,7 +41,7 @@ print_poa (PortableServer::POA_ptr poa)
 
   ACE_DEBUG ((LM_DEBUG,
               "POA name = %s\n",
-              poa_name.in ()));
+              ACE_TEXT_CHAR_TO_TCHAR (poa_name.in ())));
 
   ACE_DEBUG ((LM_DEBUG,
               "POA id = "));
@@ -70,15 +70,13 @@ print_poa (PortableServer::POA_ptr poa)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
@@ -165,10 +163,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n%s\n",
-                  root_poa_name.in (),
-                  first_poa_name.in (),
-                  second_poa_name.in (),
-                  third_poa_name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (root_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (first_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (second_poa_name.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (third_poa_name.in ())));
 
       print_poa (root_poa.in ());
 
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index fef2cc72ce4..c56fad279b7 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -20,11 +20,11 @@
 
 ACE_RCSID(Generic_Servant, client, "$Id$")
 
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:x");
   int c;
@@ -59,15 +59,13 @@ parse_args (int argc, char **argv)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -75,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       test_var test1 =
         test::_narrow (object.in ());
diff --git a/TAO/tests/POA/Reference_Counted_Servant/server.cpp b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
index a3163098dc6..a3730c71c49 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
@@ -48,10 +48,10 @@ reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb,
 {
 }
 
-static const char *ior_output_file = "ior";
+static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior");
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:");
   int c;
@@ -83,7 +83,7 @@ write_iors_to_file (const char *ior)
   FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
 
   if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n",
+    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s\n",
                        ior_output_file),
                       -1);
 
@@ -95,7 +95,7 @@ write_iors_to_file (const char *ior)
   if (result != ACE_OS::strlen (ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       ior,
+                       ACE_TEXT_CHAR_TO_TCHAR (ior),
                        ior_output_file),
                       -1);
 
@@ -105,15 +105,13 @@ write_iors_to_file (const char *ior)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -150,7 +148,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n",
-                  ior.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
 
       int write_result = write_iors_to_file (ior.in ());
       if (write_result != 0)
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index 86b01f65b47..67b407ce955 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -32,15 +32,13 @@ ACE_RCSID (Param_Test,
            "$Id$")
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN int argc, ACE_TCHAR *argv[])
 {
   int n = 1024;
 
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       ACE_Get_Opt get_opt (argc, argv, "dn:");
       int opt;
@@ -176,8 +174,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 char buffero[32];
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for CORBA::ULongLong (%s,%s)\n",
-                            i.as_string (bufferi),
-                            o.as_string (buffero)));
+                            ACE_TEXT_CHAR_TO_TCHAR (i.as_string (bufferi)),
+                            ACE_TEXT_CHAR_TO_TCHAR (o.as_string (buffero))));
 #else
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for CORBA::ULongLong (%Q,%Q)\n",
@@ -247,7 +245,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               {
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for char* (%s,%s)\n",
-                            i, o));
+                            ACE_TEXT_CHAR_TO_TCHAR (i),
+                            ACE_TEXT_CHAR_TO_TCHAR (o)));
               }
           }