1 files changed, 20 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
index 771a9582325..0fa3468806d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
@@ -13,52 +13,56 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var tmp =
-        orb->string_to_object("corbaloc:iiop:1.2@localhost:9931/NameService");
+        orb->string_to_object (
+          ACE_TEXT_ALWAYS_CHAR ("corbaloc:iiop:1.2@localhost:9931/NameService"));
 
       CosNaming::NamingContext_var root =
-        CosNaming::NamingContext::_narrow(tmp.in());
+        CosNaming::NamingContext::_narrow (tmp.in ());
 
       if (CORBA::is_nil (root.in ()))
         {
           ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil NamingService reference\n"),
-                            1);
+                             ACE_TEXT ("Nil NamingService reference\n")),
+                             1);
         }
 
-      ACE_DEBUG ((LM_INFO, "**** Narrowed root NamingContext\n"));
+      ACE_DEBUG ((LM_INFO,
+                  ACE_TEXT ("**** Narrowed root NamingContext\n")));
 
       CosNaming::Name name;
       name.length(3);
-      name[0].id = CORBA::string_dup("nsB");
-      name[1].id = CORBA::string_dup("example");
-      name[2].id = CORBA::string_dup("Hello");
-
+      name[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("nsB"));
+      name[1].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("example"));
+      name[2].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("Hello"));
 
       try
         {
           tmp = root->resolve (name);
-          ACE_DEBUG ((LM_INFO, "**** Resolved #nsB/example/Hello\n"));
+          ACE_DEBUG ((LM_INFO,
+                      ACE_TEXT ("**** Resolved #nsB/example/Hello\n")));
 
           Test::Hello_var hello =
-            Test::Hello::_narrow(tmp.in ());
+            Test::Hello::_narrow (tmp.in ());
 
           if (CORBA::is_nil (hello.in ()))
             {
               ACE_ERROR_RETURN ((LM_DEBUG,
-                                 "Nil Test::Hello reference\n"),
-                                1);
+                                 ACE_TEXT ("Nil Test::Hello reference\n")),
+                                 1);
             }
 
           CORBA::String_var the_string = hello->get_string ();
 
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n",
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - string returned <%C>\n"),
                       the_string.in ()));
 
           hello->shutdown ();
         }
       catch (const CosNaming::NamingContext::CannotProceed&)
         {
-          ACE_DEBUG ((LM_DEBUG, "Caught correct exception\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("Caught correct exception\n")));
         }
 
       orb->shutdown ();
@@ -66,7 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception caught:");
+      ex._tao_print_exception (ACE_TEXT ("Exception caught:"));
       return 1;
     }