ChangeLogTag: Wed Jun 18 15:20:00 UTC 2008 Simon Massey <sma at prismtech dot com>

10 files changed, 169 insertions, 174 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cb45813c961..f0fcd32efd8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun 18 15:20:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * orbsvcs/tests/Bug_1334_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp:
+        * orbsvcs/tests/ImplRepo/scale/client.cpp:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/admin_client.cpp:
+
+          Correct Fuzz errors concerning Wide character build compatabily
+          with ORB_init().
+
 Wed Jun 18 14:48:56 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * examples/RTScheduling/DT_Creator.h:
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 0ece672154c..e1d9ad2db4e 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -13,28 +13,28 @@ int main( int argc, char *argv[] )
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ) ;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       try
         {
            CORBA::Object_var naming =
-              orb->resolve_initial_references( "NameService") ;
-           if( CORBA::is_nil( naming.in() ) )
+              orb->resolve_initial_references ("NameService");
+           if (CORBA::is_nil (naming.in ()))
              {
-                return 1 ;
+                return 1;
              }
         }
       catch (const CORBA::Exception& ex)
         {
           ACE_UNUSED_ARG (ex);
-          return 1 ;
+          return 1;
         }
     }
   catch (const CORBA::Exception& ex)
     {
        ACE_UNUSED_ARG (ex);
-       return 2 ;
+       return 2;
     }
 
-  return 0 ;
+  return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 318032819af..45a3fa6f88d 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -68,7 +68,7 @@ parse_args (int argc, char *argv[])
                            "-b <iorfile2> -l <key2> "
                            "-c <output ior file>"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
   // Indicates sucessful parsing of the command line
@@ -131,9 +131,7 @@ void
 Manager::init (int argc,
                char *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
@@ -262,7 +260,7 @@ Manager::write_to_file (void)
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
+                           ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)),
                           1);
       ACE_OS::fprintf (output_file, "%s", iorref.in ());
       ACE_OS::fclose (output_file);
@@ -325,14 +323,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
-               expected));
+               ACE_TEXT_CHAR_TO_TCHAR (expected)));
 
   if (ACE_OS::strcmp (expected, received))
   {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n"
                     "CLIENT>          received: '%s'\n"),
-              received));
+              ACE_TEXT_CHAR_TO_TCHAR (received)));
       return -1;
   }
 
@@ -383,13 +381,13 @@ int run_abort_test (Simple_Server_ptr server,
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
-               expected));
+               ACE_TEXT_CHAR_TO_TCHAR (expected)));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n"
                     "CLIENT>          received: '%s'\n"),
-              received));
+              ACE_TEXT_CHAR_TO_TCHAR (received)));
       return -1;
     }
 
@@ -432,13 +430,13 @@ int run_shutdown_test (Simple_Server_ptr server,
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> SHUTDOWN expected: '%s'"),
-               expected));
+               ACE_TEXT_CHAR_TO_TCHAR (expected)));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n"
                     "CLIENT>          received: '%s'\n"),
-              received));
+              ACE_TEXT_CHAR_TO_TCHAR (received)));
       return -1;
     }
 
@@ -526,7 +524,7 @@ Client_i::init (void)
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR ((LM_ERROR,
                 "Unable to open %s for writing: %p\n",
-                ior_output_file));
+                ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)));
 
   ACE_Read_Buffer ior_buffer (f_handle);
 
@@ -539,9 +537,7 @@ Client_i::init (void)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->string_to_object (data);
@@ -554,7 +550,7 @@ Client_i::init (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Object reference <%s> is nil\n",
-                  data));
+                  ACE_TEXT_CHAR_TO_TCHAR (data)));
     }
 
   int rv;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index afb96cdb5c1..737d0e9f77c 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -62,7 +62,7 @@ parse_args (int argc, char* argv[])
                            "-g <iogr v10 output file> "
                            "-h <iogr v11 output file> "
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
   // Indicates sucessful parsing of the command line
@@ -117,9 +117,7 @@ void
 Manager::init (int& argc,
                char**& argv)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
@@ -296,7 +294,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const char* ior_output_file)
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
+                           ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)),
                           1);
       ACE_OS::fprintf (output_file, "%s", iorref.in ());
       ACE_OS::fclose (output_file);
@@ -355,13 +353,13 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
-              expected));
+              ACE_TEXT_CHAR_TO_TCHAR (expected)));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("... FAIL\n"
                   "CLIENT>          received: '%s'\n"),
-                  received));
+                  ACE_TEXT_CHAR_TO_TCHAR (received)));
       return -1;
     }
 
@@ -409,14 +407,14 @@ int run_abort_test (Simple_Server_ptr server,
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
-              expected));
+              ACE_TEXT_CHAR_TO_TCHAR (expected)));
 
   if (ACE_OS::strcmp (expected, received))
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("... FAIL\n"
                 "CLIENT>          received: '%s'\n"),
-                received));
+                ACE_TEXT_CHAR_TO_TCHAR (received)));
     return -1;
   }
 
@@ -453,9 +451,7 @@ Client_i::init (void)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->string_to_object (iogrstr);
@@ -469,7 +465,7 @@ Client_i::init (void)
   {
     ACE_ERROR ((LM_ERROR,
                 "Object reference <%s> is nil\n",
-                iogrstr));
+                ACE_TEXT_CHAR_TO_TCHAR (iogrstr)));
   }
 
   // run tests
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 7ed4bf7231a..87763805b81 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
                            "-b <iorfile>"
                            "-c <output ior file>"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
   // Indicates sucessful parsing of the command line
@@ -101,9 +101,7 @@ void
 Manager::init (int argc,
                char *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
@@ -225,7 +223,7 @@ Manager::write_to_file (void)
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
+                           ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)),
                           1);
       ACE_OS::fprintf (output_file, "%s", iorref.in ());
       ACE_OS::fclose (output_file);
@@ -258,7 +256,7 @@ Client_i::init (void)
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR ((LM_ERROR,
                 "Unable to open %s for writing: %p\n",
-                ior_output_file));
+                ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)));
 
   ACE_Read_Buffer ior_buffer (f_handle);
 
@@ -271,9 +269,7 @@ Client_i::init (void)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->string_to_object (data);
@@ -286,7 +282,7 @@ Client_i::init (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Object reference <%s> is nil\n",
-                  data));
+                  ACE_TEXT_CHAR_TO_TCHAR (data)));
     }
 
   run_test (server.in ());
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index e643162f41b..8d4b3ccfdeb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -12,7 +12,7 @@ int main(int argc, char* argv[]) {
   try
   {
 
-    ORB_var orb = ORB_init(argc, argv, 0);
+    ORB_var orb = ORB_init(argc, argv);
 
     Object_var obj = orb->resolve_initial_references("Test");
     test_var test = test::_narrow(obj.in());
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index f145d8e2e30..88e6efa9b88 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -25,9 +25,7 @@ int
 IFR_DII_Client::init (int argc,
                       char *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // In a reall application, we would get the scoped or
   // local name from the Interface Repository and use that
@@ -110,7 +108,7 @@ IFR_DII_Client::parse_args (int argc,
                             "usage: %s"
                             " [-n]"
                             "\n",
-                            argv [0]),
+                            ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                             -1);
       }
 
@@ -350,11 +348,11 @@ IFR_DII_Client::invoke_and_display (void)
                       ACE_TEXT ("%s:\t%s\n")
                       ACE_TEXT ("%s:\t%s\n")
                       ACE_TEXT ("%s:\t$%2.2f\n"),
-                      args->item (0)->name (),
-                      artist,
-                      args->item (1)->name (),
-                      title,
-                      args->item (2)->name (),
+                      ACE_TEXT_CHAR_TO_TCHAR (args->item (0)->name ()),
+                      ACE_TEXT_CHAR_TO_TCHAR (artist),
+                      ACE_TEXT_CHAR_TO_TCHAR (args->item (1)->name ()),
+                      ACE_TEXT_CHAR_TO_TCHAR (title),
+                      ACE_TEXT_CHAR_TO_TCHAR (args->item (2)->name ()),
                       price));
         }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 5fff9b9379b..ccb03231393 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -260,9 +260,7 @@ int
 IDL3_Client::init (int argc,
                    char *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("InterfaceRepository");
@@ -347,7 +345,7 @@ IDL3_Client::parse_args (int argc,
                            "usage: %s"
                            " [-d]"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
 
@@ -608,7 +606,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_test: lookup by id failed\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -622,7 +620,8 @@ IDL3_Client::valuetype_test (const char *repo_id,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_test: narrow to ExtValueDef failed\n"));
+                      "%stype_test: narrow to ExtValueDef failed\n",
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1038,7 +1037,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
           ACE_DEBUG ((LM_DEBUG,
                       "event_port_test: "
                       "wrong number of event %s ports\n",
-                      port_type));
+                      ACE_TEXT_CHAR_TO_TCHAR (port_type)));
         }
 
       return -1;
@@ -1057,7 +1056,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
               ACE_DEBUG ((LM_DEBUG,
                           "event_port_test: "
                           "wrong local name for %s port #%d\n",
-                          port_type,
+                          ACE_TEXT_CHAR_TO_TCHAR (port_type),
                           i + 1));
             }
 
@@ -1073,7 +1072,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
               ACE_DEBUG ((LM_DEBUG,
                           "event_port_test: "
                           "wrong base event type id for %s port #%d\n",
-                          port_type,
+                          ACE_TEXT_CHAR_TO_TCHAR (port_type),
                           i + 1));
             }
 
@@ -1097,7 +1096,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_inheritance_test: "
                       "base valuetype is null\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1112,7 +1111,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_inheritance_test: "
                       "wrong repo id for base valuetype\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1130,7 +1129,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_inheritance_test: "
                       "wrong number of supported interfaces\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1148,7 +1147,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_inheritance_test: "
                           "bad id on supported interface #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1171,7 +1170,7 @@ IDL3_Client::valuetype_attribute_test (
         {
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_attribute_test: wrong number of attrs\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1190,7 +1189,7 @@ IDL3_Client::valuetype_attribute_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_attribute_test: "
                           "wrong local name for attribute #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1207,7 +1206,7 @@ IDL3_Client::valuetype_attribute_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_attribute_test: "
                           "wrong TCKind for attribute #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1222,7 +1221,7 @@ IDL3_Client::valuetype_attribute_test (
                           "%stype_attribute_test: "
                           "wrong number of get-exceptions"
                           " for attribute #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1237,7 +1236,7 @@ IDL3_Client::valuetype_attribute_test (
                           "%stype_attribute_test: "
                           "wrong number of put-exceptions"
                           " for attribute #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1263,7 +1262,7 @@ IDL3_Client::valuetype_operation_test (
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_operation_test: "
                       "wrong number of operations\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1284,7 +1283,7 @@ IDL3_Client::valuetype_operation_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_operation_test: "
                           "wrong name for operation #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1301,7 +1300,7 @@ IDL3_Client::valuetype_operation_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_operation_test: "
                           "wrong return type\n",
-                          prefix));
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix)));
             }
 
           return -1;
@@ -1316,7 +1315,7 @@ IDL3_Client::valuetype_operation_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_operation_test: "
                           "wrong number of parameters in operation #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1335,7 +1334,7 @@ IDL3_Client::valuetype_operation_test (
                               "%stype_operation_test: "
                               "wrong name for operation #%d,"
                               "parameter #%d\n",
-                              prefix,
+                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
                               i + 1,
                               j + 1));
                 }
@@ -1353,7 +1352,7 @@ IDL3_Client::valuetype_operation_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_operation_test: "
                           "wrong number of exceptions in operation #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1379,7 +1378,7 @@ IDL3_Client::valuetype_member_test (
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_member_test: "
                       "wrong number of members\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1396,7 +1395,7 @@ IDL3_Client::valuetype_member_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_member_test: "
                           "wrong access value in member #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1412,7 +1411,7 @@ IDL3_Client::valuetype_member_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_member_test: "
                           "wrong repo id for member #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1438,7 +1437,7 @@ IDL3_Client::valuetype_factory_test (
           ACE_DEBUG ((LM_DEBUG,
                       "%stype_factory_test: "
                       "wrong number of factories\n",
-                      prefix));
+                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
         }
 
       return -1;
@@ -1458,7 +1457,7 @@ IDL3_Client::valuetype_factory_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_factory_test: "
                           "wrong number of params in factory #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1479,7 +1478,7 @@ IDL3_Client::valuetype_factory_test (
                   ACE_DEBUG ((LM_DEBUG,
                               "%stype_factory_test: "
                               "wrong name for arg #%d in factory #%d\n",
-                              prefix,
+                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
                               j + 1,
                               i + 1));
                 }
@@ -1497,7 +1496,7 @@ IDL3_Client::valuetype_factory_test (
               ACE_DEBUG ((LM_DEBUG,
                           "%stype_factory_test: "
                           "wrong number of exceptions in factory #%d\n",
-                          prefix,
+                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
                           i + 1));
             }
 
@@ -1516,7 +1515,7 @@ IDL3_Client::valuetype_factory_test (
                   ACE_DEBUG ((LM_DEBUG,
                               "%stype_factory_test: "
                               "wrong name for exception #%d in factory #%d\n",
-                              prefix,
+                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
                               j + 1,
                               i + 1));
                 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index d70b668d55f..c01a621a2a9 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -62,9 +62,7 @@ int  main(int argc, char** argv)
 {
   try
     {
-      CORBA::ORB_var      orb = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      CORBA::ORB_var  orb = CORBA::ORB_init (argc, argv);
       CORBA::Object_var object =
         orb->resolve_initial_references ("InterfaceRepository");
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 407c0d4c9be..da3882c00a7 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -60,12 +60,9 @@ Admin_Client::init (int argc,
 {
   try
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         return retval;
@@ -181,7 +178,7 @@ Admin_Client::parse_args (int argc,
                            " [-i iterations]"
                            " [-t test name]"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
 
@@ -350,7 +347,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
@@ -361,7 +358,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
@@ -372,7 +369,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_enum") == 0);
@@ -383,7 +380,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::version: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -421,7 +418,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::name: %s\n"),
-                  td->name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
@@ -430,7 +427,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::id: %s\n"),
-                  td->id.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->id.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0);
@@ -439,7 +436,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::defined_in: %s\n"),
-                  td->defined_in.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->defined_in.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0);
@@ -448,7 +445,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::version: %s\n"),
-                  td->version.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
@@ -470,7 +467,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::type::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
@@ -481,7 +478,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::describe::value::type::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
@@ -512,7 +509,7 @@ Admin_Client::enum_test (void)
                       ACE_TEXT ("EnumDef::describe::value::type::")
                       ACE_TEXT ("member_name[%d]: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0);
@@ -549,7 +546,7 @@ Admin_Client::enum_test (void)
                       ACE_TEXT ("EnumDef::")
                       ACE_TEXT ("members[%d]: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
@@ -568,7 +565,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "another_enum") == 0);
@@ -579,7 +576,7 @@ Admin_Client::enum_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::another_enum") == 0);
@@ -619,7 +616,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
@@ -630,7 +627,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -641,7 +638,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_alias") == 0);
@@ -652,7 +649,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::version: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -671,7 +668,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::version: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.1") == 0);
@@ -684,7 +681,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nAliasDef::type::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -762,7 +759,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nAliasDef::describe::value::name: %s\n"),
-                  td->name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0);
@@ -771,7 +768,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::describe::value::version: %s\n"),
-                  td->version.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
@@ -793,7 +790,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::describe::value::type::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
@@ -804,7 +801,7 @@ Admin_Client::alias_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("AliasDef::describe::value::type::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -851,7 +848,7 @@ Admin_Client::native_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("NativeDef::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_native:1.0") == 0);
@@ -862,7 +859,7 @@ Admin_Client::native_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("NativeDef::name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_native") == 0);
@@ -873,7 +870,7 @@ Admin_Client::native_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("NativeDef::version: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -884,7 +881,7 @@ Admin_Client::native_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("NativeDef::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_native") == 0);
@@ -974,7 +971,7 @@ Admin_Client::struct_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("StructDef::type::member_name[%d]: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
@@ -990,7 +987,7 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nStructDef::describe::value::name: %s\n"),
-                  td->name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0);
@@ -999,7 +996,7 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("StructDef::describe::value::id: %s\n"),
-                  td->id.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->id.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0);
@@ -1008,7 +1005,7 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("StructDef::describe::value::version: %s\n"),
-                  td->version.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
@@ -1056,7 +1053,7 @@ Admin_Client::struct_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
                       i,
-                      out_members[i].name.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
         }
 
       if (i == length - 1)
@@ -1081,7 +1078,7 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Repository::lookup::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
@@ -1094,7 +1091,7 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("StructDef::lookup::absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
@@ -1110,7 +1107,7 @@ Admin_Client::struct_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("StructDef::lookup::defined_in::")
                   ACE_TEXT ("absolute_name: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct") == 0);
@@ -1154,7 +1151,7 @@ Admin_Client::struct_test (void)
               LM_DEBUG,
               ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1194,7 +1191,7 @@ Admin_Client::struct_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1231,7 +1228,7 @@ Admin_Client::struct_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::describe_contents[%d]::id: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1279,7 +1276,7 @@ Admin_Client::struct_test (void)
               LM_DEBUG,
               ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1452,7 +1449,7 @@ Admin_Client::union_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::type::member_name[%d]: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       // Multiple labels for first member shifts index by 1.
@@ -1481,7 +1478,7 @@ Admin_Client::union_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::type::member_label[%d]: %s\n"),
                       i,
-                      i == (CORBA::ULong) slot ? "default" : tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (i == (CORBA::ULong) slot ? "default" : tmp)));
         }
 
       // Labels are not in order.
@@ -1575,7 +1572,7 @@ Admin_Client::exception_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("ExceptionDef::type::member_name[%d]: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
@@ -1591,7 +1588,7 @@ Admin_Client::exception_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nExceptionDef::describe::value::name: %s\n"),
-                  ed->name.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ed->name.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
@@ -1600,7 +1597,7 @@ Admin_Client::exception_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ExceptionDef::describe::value::id: %s\n"),
-                  ed->id.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ed->id.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0);
@@ -1609,7 +1606,7 @@ Admin_Client::exception_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ExceptionDef::describe::value::defined_in: %s\n"),
-                  ed->defined_in.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ed->defined_in.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0);
@@ -1618,7 +1615,7 @@ Admin_Client::exception_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ExceptionDef::describe::value::version: %s\n"),
-                  ed->version.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (ed->version.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0);
@@ -1668,7 +1665,7 @@ Admin_Client::exception_test (void)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
                     i,
-                    out_members[i].name.in ()));
+                    ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
 
       if (i == 2)
         {
@@ -1702,7 +1699,7 @@ Admin_Client::exception_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
                       i,
-                      out_members[i].name.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
         }
 
       if (i == 1)
@@ -1784,7 +1781,7 @@ Admin_Client::exception_test (void)
               LM_DEBUG,
               ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1818,7 +1815,7 @@ Admin_Client::exception_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::lookup_name%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -1871,7 +1868,7 @@ Admin_Client::exception_test (void)
                           ACE_TEXT ("Repository::describe_contents[%d]")
                           ACE_TEXT ("::value::name: %s\n"),
                           i,
-                          ed->name.in ()));
+                          ACE_TEXT_CHAR_TO_TCHAR (ed->name.in ())));
             }
 
           ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
@@ -1900,7 +1897,7 @@ Admin_Client::exception_test (void)
                           ACE_TEXT ("Repository::describe_contents[%d]")
                           ACE_TEXT ("::value::name: %s\n"),
                           i,
-                          td->name.in ()));
+                          ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
             }
 
           ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
@@ -1931,7 +1928,7 @@ Admin_Client::exception_test (void)
               LM_DEBUG,
               ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -2008,7 +2005,7 @@ Admin_Client::constant_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ConstantDef::value (string): %s\n"),
-                  out_s));
+                  ACE_TEXT_CHAR_TO_TCHAR (out_s)));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (out_s, s) == 0);
@@ -2122,7 +2119,7 @@ Admin_Client::constant_test (void)
       char buffer[32];
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ConstantDef::value (ulonglong): %s\n"),
-                  out_ull_val.as_string (buffer)));
+                  ACE_TEXT_CHAR_TO_TCHAR (out_ull_val.as_string (buffer))));
 #else
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ConstantDef::value (ulonglong): %Q\n"),
@@ -2284,7 +2281,7 @@ Admin_Client::interface_test (void)
                       ACE_TEXT ("OperationDef::describe::parameters[%d]::")
                       ACE_TEXT ("name: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, names[i]) == 0);
@@ -2344,7 +2341,7 @@ Admin_Client::interface_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nInterfaceDef::describe_interface::")
                   ACE_TEXT ("type::id: %s\n"),
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:p_iface:1.0") == 0);
@@ -2383,7 +2380,7 @@ Admin_Client::interface_test (void)
                       ACE_TEXT ("InterfaceDef::describe_interface::")
                       ACE_TEXT ("operations[0]::contexts[%d]: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, contexts[i]) == 0);
@@ -2411,7 +2408,7 @@ Admin_Client::interface_test (void)
                       ACE_TEXT ("InterfaceDef::describe::operations[3]::")
                       ACE_TEXT ("contexts[%d]: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, "if_exception") == 0);
@@ -2424,7 +2421,7 @@ Admin_Client::interface_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nInterfaceDef::describe_interface::")
                   ACE_TEXT ("attributes::defined_in: %s\n"),
-                  tmp));
+                  ACE_TEXT_CHAR_TO_TCHAR (tmp)));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (tmp, "IDL:gp_iface:1.0") == 0);
@@ -2466,7 +2463,7 @@ Admin_Client::interface_test (void)
                       ACE_TEXT ("InterfaceDef::describe::")
                       ACE_TEXT ("base_interfaces[%d]: %s\n"),
                       i,
-                      base_iface_id));
+                      ACE_TEXT_CHAR_TO_TCHAR (base_iface_id)));
         }
     }
 
@@ -2494,7 +2491,7 @@ Admin_Client::interface_test (void)
               LM_DEBUG,
               ACE_TEXT ("InterfaceDef::base_interfaces[%d]::name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
     }
@@ -2522,7 +2519,7 @@ Admin_Client::interface_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("InterfaceDef::contents[%d]::name: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       CORBA::Container_var cr =
@@ -2539,7 +2536,7 @@ Admin_Client::interface_test (void)
                       ACE_TEXT ("InterfaceDef::contents[%d]::")
                       ACE_TEXT ("defined_in::name: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), "p_iface") == 0
@@ -2662,7 +2659,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
@@ -2715,7 +2712,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       if (i == 0)
@@ -2754,7 +2751,7 @@ Admin_Client::move_test (void)
               LM_DEBUG,
               ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -2815,7 +2812,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, u_names[i]) == 0);
@@ -2848,7 +2845,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       cmp_result =
@@ -2887,7 +2884,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
                       i,
-                      str.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
         }
 
       cmp_result =
@@ -2924,7 +2921,7 @@ Admin_Client::move_test (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
                       i,
-                      tmp));
+                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, s_names[i]) == 0);
@@ -3046,7 +3043,7 @@ Admin_Client::module_test (void)
       ACE_DEBUG ((
           LM_DEBUG,
           ACE_TEXT ("ModuleDef::lookup (absolute)::absolute_name: %s\n"),
-          str.in ()
+          ACE_TEXT_CHAR_TO_TCHAR (str.in ())
         ));
     }
 
@@ -3064,7 +3061,7 @@ Admin_Client::module_test (void)
       ACE_DEBUG ((
           LM_DEBUG,
           ACE_TEXT ("ModuleDef::lookup (relative)::absolute_name: %s\n"),
-          str.in ()
+          ACE_TEXT_CHAR_TO_TCHAR (str.in ())
         ));
     }
 
@@ -3100,7 +3097,7 @@ Admin_Client::module_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -3136,7 +3133,7 @@ Admin_Client::module_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }
 
@@ -3179,7 +3176,7 @@ Admin_Client::module_test (void)
               LM_DEBUG,
               ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
               i,
-              str.in ()
+              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
             ));
         }